diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
index 634df2c5..8140a6ce 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
@@ -26,6 +26,7 @@ import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 
 import org.kurento.client.KurentoConnectionListener;
 import org.slf4j.Logger;
@@ -197,4 +198,12 @@ public abstract class KmsManager {
 		}
 	}
 
+	@PreDestroy
+	public void close() {
+		log.info("Closing all KurentoClients");
+		this.kmss.values().forEach(kms -> {
+			kms.getKurentoClient().destroy();
+		});
+	}
+
 }