diff --git a/common/item.c b/common/item.c
index fb79369..1e9c27e 100644
--- a/common/item.c
+++ b/common/item.c
@@ -579,7 +579,9 @@ void query_short_name(const object *op, char *buf, size_t size) {
     case SCROLL:
     case WAND:
     case ROD:
-//    case POTION:
+    case POTION:
+        if (op->type == POTION && op->subtype != POT_THROW)
+          break
         if (QUERY_FLAG(op, FLAG_IDENTIFIED)||QUERY_FLAG(op, FLAG_BEEN_APPLIED)) {
             if (!op->title) {
                 safe_strcat(buf, " of ", &len, size);
@@ -786,6 +788,8 @@ void query_base_name(const object *op, int plural, char *buf, size_t size) {
     case WAND:
     case ROD:
     case POTION:
+        if (op->type == POTION && op->subtype != POT_THROW)
+          break
         if (QUERY_FLAG(op, FLAG_IDENTIFIED)||QUERY_FLAG(op, FLAG_BEEN_APPLIED)) {
             if (!op->title) {
                 safe_strcat(buf, " of ", &len, size);