diff --git a/davtelepot/__init__.py b/davtelepot/__init__.py
index 6820c45..195962f 100644
--- a/davtelepot/__init__.py
+++ b/davtelepot/__init__.py
@@ -14,7 +14,7 @@ __author__ = "Davide Testa"
 __email__ = "davide@davte.it"
 __credits__ = ["Marco Origlia", "Nick Lee @Nickoala"]
 __license__ = "GNU General Public License v3.0"
-__version__ = "2.1.32"
+__version__ = "2.1.33"
 __maintainer__ = "Davide Testa"
 __contact__ = "t.me/davte"
 
diff --git a/davtelepot/administration_tools.py b/davtelepot/administration_tools.py
index 2517702..0f2efcf 100644
--- a/davtelepot/administration_tools.py
+++ b/davtelepot/administration_tools.py
@@ -582,6 +582,14 @@ default_admin_messages = {
                   "database",
             'it': "Ricevi il risultato di una query SQL sul database del bot"
         },
+        'help': {
+            'en': "Write a SQL query to be run on bot database.\n\n"
+                  "<b>Example</b>\n"
+                  "<code>/query SELECT * FROM users WHERE 0</code>",
+            'it': "Invia una query SQL da eseguire sul database del bot.\n\n"
+                  "<b>Esempio</b>\n"
+                  "<code>/query SELECT * FROM users WHERE 0</code>"
+        },
         'no_iterable': {
             'en': "No result to show was returned",
             'it': "La query non ha restituito risultati da mostrare"
@@ -746,6 +754,11 @@ async def _query_command(bot, update, user_record):
         bot,
         ['query', ]
     )
+    if len(query) == 0:
+        return bot.get_message(
+            'admin', 'query_command', 'help',
+            update=update, user_record=user_record
+        )
     try:
         with bot.db as db:
             record = db.query(query)