diff --git a/main.py b/main.py
index 9223899..f4018cf 100644
--- a/main.py
+++ b/main.py
@@ -88,17 +88,20 @@ def thread_main():
     if config.twitch_module == True:
         twitchCert: credentials.Twitch_Credential = credentials_manager.find_Twitch_Credential(config.credentialsNickname)
         thread_ = threading.Thread(target=twitch_module_init, args=(dbCert, twitchCert))
+        thread_.daemon = True
         threads.append(thread_)
         thread_.start()
 
     if config.discord_module == True:
         discordCert: credentials.Discord_Credential = credentials_manager.find_Discord_Credential(config.credentialsNickname)
         thread_ = threading.Thread(target=discord_module_init, args=(dbCert, discordCert))
+        thread_.daemon = True
         threads.append(thread_)
         thread_.start()
 
     if config.test_module == True:
         thread_ = threading.Thread(target=test_module_init, args=(dbCert, None))
+        thread_.daemon = True
         threads.append(thread_)
         thread_.start()
 
@@ -106,6 +109,7 @@ def thread_main():
         if utility.isRunningInDocker() == False:
             config.user_module = False
             thread_ = threading.Thread(target=user_module_init, args=(dbCert, None))
+            thread_.daemon = True
             threads.append(thread_)
             thread_.start()