diff --git a/sopel_modules/SpiceBot_Events/Events.py b/sopel_modules/SpiceBot_Events/Events.py
index ec69bbe..2dd1eed 100644
--- a/sopel_modules/SpiceBot_Events/Events.py
+++ b/sopel_modules/SpiceBot_Events/Events.py
@@ -54,7 +54,13 @@ def bot_events_connected(bot, trigger):
 
     while 'SpiceBot_Events' in bot.memory:
         if len(bot.memory['SpiceBot_Events']["queue"]):
-            bot.dispatch(bot.memory['SpiceBot_Events']["queue"][0])
+            number = bot.memory['SpiceBot_Events']["queue"][0]["number"]
+            message = bot.memory['SpiceBot_Events']["queue"][0]["message"]
+            pretrigger = sopel.trigger.PreTrigger(
+                bot.nick,
+                ":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
+            )
+            bot.dispatch(pretrigger)
             del bot.memory['SpiceBot_Events']["queue"][0]
 
 
diff --git a/sopel_modules/SpiceBot_Events/System.py b/sopel_modules/SpiceBot_Events/System.py
index 5decaad..cd97620 100644
--- a/sopel_modules/SpiceBot_Events/System.py
+++ b/sopel_modules/SpiceBot_Events/System.py
@@ -24,15 +24,8 @@ def bot_events_trigger(bot, number, message):
     bot_events_setup_check(bot)
 
     bot.memory["SpiceBot_Events"]["triggers"][str(number)] = message
-
-    pretrigger = sopel.trigger.PreTrigger(
-        bot.nick,
-        ":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
-    )
-    if number in ['1001', '1002', '1003']:
-        bot.dispatch(pretrigger)
-    else:
-        bot.memory['SpiceBot_Events']["queue"].append(pretrigger)
+    pretriggerdict = {"number": number, "message": message}
+    bot.memory['SpiceBot_Events']["queue"].append(pretriggerdict)
 
 
 def bot_events_setup_check(bot):