diff --git a/src/DatabaseLibrary/connection_manager.py b/src/DatabaseLibrary/connection_manager.py
index d2d2699..499e094 100644
--- a/src/DatabaseLibrary/connection_manager.py
+++ b/src/DatabaseLibrary/connection_manager.py
@@ -354,7 +354,10 @@ def disconnect_from_database(self, error_if_no_connection: bool = False, alias:
         """
         logger.info("Executing : Disconnect From Database")
         if not alias:
-            alias = self.default_alias
+            if not self._connections or self.default_alias in self._connections:
+                alias = self.default_alias
+            else:
+                alias = list(self._connections.keys())[-1]
         try:
             db_connection = self._connections.pop(alias)
             db_connection.client.close()