diff --git a/sopel_modules/SpiceBot_Channels/Channels.py b/sopel_modules/SpiceBot_Channels/Channels.py
index c181b53..e81e162 100644
--- a/sopel_modules/SpiceBot_Channels/Channels.py
+++ b/sopel_modules/SpiceBot_Channels/Channels.py
@@ -88,7 +88,7 @@ def trigger_channel_list_initial(bot, trigger):
     if "*" in bot.memory['SpiceBot_Channels']['channels']:
         del bot.memory['SpiceBot_Channels']['channels']["*"]
 
-    while True:
+    while 'SpiceBot_Channels' in bot.memory:
         time.sleep(1800)
         oldlist = list(bot.memory['SpiceBot_Channels']['channels'].keys())
         bot.write(['LIST'])
diff --git a/sopel_modules/SpiceBot_Logs/Logs.py b/sopel_modules/SpiceBot_Logs/Logs.py
index c046605..85593d5 100644
--- a/sopel_modules/SpiceBot_Logs/Logs.py
+++ b/sopel_modules/SpiceBot_Logs/Logs.py
@@ -50,7 +50,7 @@ def join_log_channel(bot, trigger):
         if 'SpiceBot_Logs_queue' not in bot.memory:
             bot.memory['SpiceBot_Logs_queue'] = []
 
-        while True:
+        while 'SpiceBot_Logs_queue' in bot.memory:
             if len(bot.memory['SpiceBot_Logs_queue']):
                 bot.say(str(bot.memory['SpiceBot_Logs_queue'][0]), channel)
                 del bot.memory['SpiceBot_Logs_queue'][0]