diff --git a/rfswarm_manager/rfswarm.py b/rfswarm_manager/rfswarm.py
index 2c84a9284..a8e902672 100644
--- a/rfswarm_manager/rfswarm.py
+++ b/rfswarm_manager/rfswarm.py
@@ -2347,6 +2347,9 @@ def mainloop(self):
 		if not base.args.nogui:
 			base.gui.mainloop()
 
+		while base.run_dbthread:
+			time.sleep(300)
+
 		base.debugmsg(5, "mainloop end")
 
 	def on_closing(self, _event=None, *args):
@@ -2414,12 +2417,7 @@ def run_agent_server(self):
 
 		server_address = (srvip, srvport)
 		try:
-			if sys.version_info >= (3, 12):
-				# not sure if this is the besst solution, may cause more
-				# problmes than it fixes, but it's an attempt
-				base.agenthttpserver = HTTPServer(server_address, AgentServer)
-			else:
-				base.agenthttpserver = ThreadingHTTPServer(server_address, AgentServer)
+			base.agenthttpserver = ThreadingHTTPServer(server_address, AgentServer)
 		except PermissionError:
 			base.debugmsg(0, "Permission denied when trying :", server_address)
 			self.on_closing()