diff --git a/src/notification.c b/src/notification.c
index 7ed4364..4e9f74c 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -452,6 +452,12 @@ void notification_init(struct notification *n)
         /* Process rules */
         rule_apply_all(n);
 
+        if (g_str_has_prefix(n->summary, "DUNST_COMMAND_")) {
+                char *msg = "DUNST_COMMAND_* has been removed, please switch to dunstctl. See #830 for more details. https://github.com/dunst-project/dunst/pull/830";
+                LOG_W(msg);
+                n->body = string_append(n->body, msg, "\n");
+        }
+
         /* UPDATE derived fields */
         notification_extract_urls(n);
         notification_format_message(n);
diff --git a/src/queues.c b/src/queues.c
index 8dcbabf..427f09f 100644
--- a/src/queues.c
+++ b/src/queues.c
@@ -168,19 +168,6 @@ int queues_notification_insert(struct notification *n)
                 LOG_M("Skipping notification: '%s' '%s'", n->body, n->summary);
                 return 0;
         }
-        /* Do not insert the message if it's a command */
-        if (STR_EQ("DUNST_COMMAND_PAUSE", n->summary)) {
-                dunst_status(S_RUNNING, false);
-                return 0;
-        }
-        if (STR_EQ("DUNST_COMMAND_RESUME", n->summary)) {
-                dunst_status(S_RUNNING, true);
-                return 0;
-        }
-        if (STR_EQ("DUNST_COMMAND_TOGGLE", n->summary)) {
-                dunst_status(S_RUNNING, !dunst_status_get().running);
-                return 0;
-        }
 
         bool inserted = false;
         if (n->id != 0) {