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 67d6162c..2196bf4d 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
@@ -90,8 +90,8 @@ public abstract class KmsManager {
 		this.kmss.put(kms.getUri(), kms);
 	}
 
-	public synchronized void removeKms(String kmsUri) {
-		this.kmss.remove(kmsUri);
+	public synchronized Kms removeKms(String kmsUri) {
+		return this.kmss.remove(kmsUri);
 	}
 
 	public synchronized Kms getLessLoadedKms() throws NoSuchElementException {