diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py
index c2c2282aa..c929c156d 100644
--- a/src/adhoc_commands.py
+++ b/src/adhoc_commands.py
@@ -445,7 +445,7 @@ class CommandWindow:
 			# no commands => no commands stage
 			# commands => command selection stage
 			query = response.getTag('query')
-			if query:
+			if query and query.getAttr('node') == xmpp.NS_COMMANDS:
 				items = query.getTags('item')
 			else:
 				items = []