diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java
index 6648c80e..7c3386ef 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java
@@ -228,7 +228,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService
 			List<Bind> binds = new ArrayList<>();
 			binds.add(bind1);
 			containerId = dockerManager.runContainer(properties.mediaNode(), container, containerName, null, volumes,
-					binds, "host", envs, null, properties.shmSize(), false, null, true,
+					binds, "host", envs, null, properties.shmSize(), false, null,
 					openviduConfig.isOpenviduRecordingGPUEnabled());
 			this.sessionsContainers.put(session.getSessionId(), containerId);
 		} catch (Exception e) {
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
index 5df4e85f..e8f2639f 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
@@ -164,7 +164,7 @@ public class ComposedRecordingService extends RecordingService {
 			List<Bind> binds = new ArrayList<>();
 			binds.add(bind1);
 			containerId = dockerManager.runContainer(properties.mediaNode(), container, containerName, null, volumes,
-					binds, "host", envs, null, properties.shmSize(), false, null, true,
+					binds, "host", envs, null, properties.shmSize(), false, null,
 					openviduConfig.isOpenviduRecordingGPUEnabled());
 		} catch (Exception e) {
 			this.cleanRecordingMaps(recording);
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/WaitForContainerStoppedCallback.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/WaitForContainerStoppedCallback.java
index 0f2ac573..ff9dc823 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/WaitForContainerStoppedCallback.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/WaitForContainerStoppedCallback.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 
 import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.WaitResponse;
 
 public class WaitForContainerStoppedCallback implements ResultCallback<WaitResponse> {
@@ -34,7 +35,6 @@ public class WaitForContainerStoppedCallback implements ResultCallback<WaitRespo
 
 	@Override
 	public void close() throws IOException {
-		// TODO Auto-generated method stub
 	}
 
 	@Override
@@ -44,17 +44,19 @@ public class WaitForContainerStoppedCallback implements ResultCallback<WaitRespo
 
 	@Override
 	public void onError(Throwable arg0) {
-		// TODO Auto-generated method stub
+		if (arg0 instanceof NotFoundException) {
+			// The container cannot be found
+			System.err.println("Waiting for container stopped but it did not exist: " + arg0.getMessage());
+			latch.countDown();
+		}
 	}
 
 	@Override
 	public void onStart(Closeable arg0) {
-		// TODO Auto-generated method stub
 	}
 
 	@Override
 	public void onNext(WaitResponse arg0) {
-		// TODO Auto-generated method stub
 	}
 
 }
diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
index 2ba06a73..dc54c76e 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
@@ -13,7 +13,7 @@ public interface DockerManager {
 
 	public String runContainer(String mediaNodeId, String image, String containerName, String user,
 			List<Volume> volumes, List<Bind> binds, String networkMode, List<String> envs, List<String> command,
-			Long shmSize, boolean privileged, Map<String, String> labels, boolean autoremove, boolean enableGPU)
+			Long shmSize, boolean privileged, Map<String, String> labels, boolean enableGPU)
 			throws Exception;
 
 	public void removeContainer(String mediaNodeId, String containerId, boolean force);
diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java
index 2fcdedbe..c048a443 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java
@@ -127,8 +127,7 @@ public class LocalDockerManager implements DockerManager {
 	@Override
 	public String runContainer(String mediaNodeId, String image, String containerName, String user,
 			List<Volume> volumes, List<Bind> binds, String networkMode, List<String> envs, List<String> command,
-			Long shmSize, boolean privileged, Map<String, String> labels, boolean autoremove, boolean enableGPU)
-			throws Exception {
+			Long shmSize, boolean privileged, Map<String, String> labels, boolean enableGPU) throws Exception {
 
 		CreateContainerCmd cmd = dockerClient.createContainerCmd(image).withEnv(envs);
 		if (containerName != null) {
@@ -139,8 +138,7 @@ public class LocalDockerManager implements DockerManager {
 			cmd.withUser(user);
 		}
 
-		HostConfig hostConfig = new HostConfig().withNetworkMode(networkMode).withPrivileged(privileged)
-				.withAutoRemove(autoremove);
+		HostConfig hostConfig = new HostConfig().withNetworkMode(networkMode).withPrivileged(privileged);
 		if (shmSize != null) {
 			hostConfig.withShmSize(shmSize);
 		}