diff --git a/sopel_modules/SpiceBot_Events/Events.py b/sopel_modules/SpiceBot_Events/Events.py
index 524e0d0..82b3af4 100644
--- a/sopel_modules/SpiceBot_Events/Events.py
+++ b/sopel_modules/SpiceBot_Events/Events.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 import sopel.module
 from sopel.trigger import PreTrigger
 
-from .System import bot_events_trigger, bot_events_recieved, bot_events_startup_check, bot_events_check, bot_events_setup_check
+from .System import bot_events_trigger, bot_events_recieved, bot_events_startup_check, bot_events_setup_check
 from sopel_modules.SpiceBot_SBTools import bot_logging
 
 import time
@@ -16,9 +16,6 @@ import time
 def bot_startup_connection(bot, trigger):
     bot_events_trigger(bot, 1001, "Welcome to the SpiceBot Events System")
 
-    if bot_events_check(bot, '1004'):
-        return
-
     while not len(bot.channels.keys()) > 0:
         pass
     time.sleep(1)
diff --git a/sopel_modules/SpiceBot_Events/System.py b/sopel_modules/SpiceBot_Events/System.py
index cd97620..07a6e7c 100644
--- a/sopel_modules/SpiceBot_Events/System.py
+++ b/sopel_modules/SpiceBot_Events/System.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi
 
 # sopel imports
 import sopel
+from sopel.trigger import PreTrigger
 
 from sopel_modules.SpiceBot_SBTools import bot_logging
 
@@ -24,8 +25,15 @@ def bot_events_trigger(bot, number, message):
     bot_events_setup_check(bot)
 
     bot.memory["SpiceBot_Events"]["triggers"][str(number)] = message
-    pretriggerdict = {"number": number, "message": message}
-    bot.memory['SpiceBot_Events']["queue"].append(pretriggerdict)
+    if str(number) in ['1001', '1002', '1003']:
+        pretrigger = PreTrigger(
+            bot.nick,
+            ":SpiceBot_Events " + str(number) + " " + str(bot.nick) + " :" + message
+        )
+        bot.dispatch(pretrigger)
+    else:
+        pretriggerdict = {"number": number, "message": message}
+        bot.memory['SpiceBot_Events']["queue"].append(pretriggerdict)
 
 
 def bot_events_setup_check(bot):