diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java
index 150a686..851b2a2 100644
--- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java
+++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java
@@ -263,7 +263,12 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm {
 
 	@Override
 	public void shutdown() {
+				
 		AnalysisLogger.getLogger().debug("In SubmitQuery->Shutdown");
+		
+		if (sf.isClosed() == false) {
+			mgt.closeConnection();
+		}
 	}
 
 	// Method that recovers the info useful for the connection