diff --git a/breadtube_bot/bot.py b/breadtube_bot/bot.py
index 9d43c9b..9041c77 100644
--- a/breadtube_bot/bot.py
+++ b/breadtube_bot/bot.py
@@ -261,6 +261,10 @@ class Bot:
                 delayed_delete[message.id] = message
                 continue
 
+            if self._parse_command(message):
+                immediate_delete[message.id] = message
+                continue
+
             if init_message_found:
                 self.logger.debug('Marking message for immediate deletion (init found): %s', message)
                 immediate_delete[message.id] = message
@@ -310,9 +314,6 @@ class Bot:
                     init_message_found = True
                 continue
 
-            if self._parse_command(message):
-                continue
-
             self.logger.debug('Reading attachment')
             attachment = message.attachments[0]
             if attachment.size > self.MAX_DOWNLOAD_SIZE: