diff --git a/src/primaite/simulator/system/applications/database_client.py b/src/primaite/simulator/system/applications/database_client.py
index fbeefe6a..dfa5e445 100644
--- a/src/primaite/simulator/system/applications/database_client.py
+++ b/src/primaite/simulator/system/applications/database_client.py
@@ -193,7 +193,10 @@ class DatabaseClient(Application):
             return False
 
         if connection_id is None:
-            connection_id = str(uuid4())
+            if self.connections:
+                connection_id = list(self.connections.keys())[-1]
+            else:
+                connection_id = str(uuid4())
 
         if not self.connections.get(connection_id):
             if not self.connect(connection_id=connection_id):