diff --git a/connection.c b/connection.c
index 91e1917e..080006bc 100644
--- a/connection.c
+++ b/connection.c
@@ -690,6 +690,11 @@ CC_cleanup(ConnectionClass *self, BOOL keepCommunication)
 		StopLimitlessMonitorService(self->connInfo.limitless_service_id);
 	}
 
+	// Shutdown Logger if it was enabled
+	if (self->connInfo.rds_logging_enabled) {
+		ShutdownRdsLogger();
+	}
+
 	/* Cancel an ongoing transaction */
 	/* We are always in the middle of a transaction, */
 	/* even if we are in auto commit. */
@@ -1335,8 +1340,6 @@ CC_connect(ConnectionClass *self, char *salt_para)
 
 	if (ci->rds_logging_enabled) {
 		InitializeRdsLogger(ci->log_dir, ci->rds_log_threshold);
-	} else {
-		ShutdownRdsLogger(); // disable logs from the library
 	}
 
 	if (stricmp(ci->authtype, SECRET_MODE) == 0) {
diff --git a/libs/aws-rds-odbc b/libs/aws-rds-odbc
index 3ed61800..616ed845 160000
--- a/libs/aws-rds-odbc
+++ b/libs/aws-rds-odbc
@@ -1 +1 @@
-Subproject commit 3ed6180078eb7a0f003921360f07dad71629c0b9
+Subproject commit 616ed845bd19988bdb8d0d56c499b44d681090a3