diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
index b5d9917b..7675389b 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
@@ -55,6 +55,9 @@ public class OpenviduConfig {
 	@Value("${openvidu.recording.version}")
 	private String openviduRecordingVersion;
 
+	@Value("${openvidu.recording.autostop-timeout}")
+	private int openviduRecordingAutostopTimeout;
+
 	@Value("${openvidu.streams.video.max-recv-bandwidth}")
 	private int openviduStreamsVideoMaxRecvBandwidth;
 
@@ -78,7 +81,7 @@ public class OpenviduConfig {
 
 	@Value("${coturn.redis.connect-timeout}")
 	private String coturnRedisConnectTimeout;
-	
+
 	@Value("${kms.stats-enabled}")
 	private boolean kmsStatsEnabled;
 
@@ -143,6 +146,10 @@ public class OpenviduConfig {
 		return this.openviduRecordingVersion;
 	}
 
+	public int getOpenviduRecordingAutostopTimeout() {
+		return this.openviduRecordingAutostopTimeout;
+	}
+
 	public String getSpringProfile() {
 		return springProfile;
 	}
@@ -171,11 +178,11 @@ public class OpenviduConfig {
 	public String getCoturnDatabaseDbname() {
 		return this.coturnRedisDbname;
 	}
-	
+
 	public boolean isKmsStatsEnabled() {
 		return this.kmsStatsEnabled;
 	}
-	
+
 	public String getOpenViduRecordingNotification() {
 		return this.openviduRecordingNotification;
 	}
diff --git a/openvidu-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/openvidu-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index cd4a3052..8050db58 100644
--- a/openvidu-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/openvidu-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -65,6 +65,12 @@
 			"type": "java.lang.String",
 			"description": "Tag for openvidu/openvidu-recording Docker image"
 		},
+		{
+			"name": "openvidu.recording.autostop-timeout",
+			"type": "java.lang.Integer",
+			"description": "Timeout in seconds for automatically stopping the recording of a session when last user disconnects or when it starts and no user is publishing (only if RecordingMode.MANUAL)",
+			"defaultValue": 120
+		},
 		{
 			"name": "coturn.sqlite",
 			"type": "java.lang.String",
diff --git a/openvidu-server/src/main/resources/application-docker.properties b/openvidu-server/src/main/resources/application-docker.properties
index 4df9ef51..14119fba 100644
--- a/openvidu-server/src/main/resources/application-docker.properties
+++ b/openvidu-server/src/main/resources/application-docker.properties
@@ -16,6 +16,10 @@ kms.uris=[\"ws://localhost:8888/kurento\"]
 openvidu.secret: MY_SECRET
 openvidu.publicurl: local
 openvidu.cdr: false
+
 openvidu.recording: false
 openvidu.recording.path: /opt/openvidu/recordings
-openvidu.recording.public-access: false
\ No newline at end of file
+openvidu.recording.public-access: false
+openvidu.recording.notification: publisher_moderator
+openvidu.recording.custom-layout: /opt/openvidu/custom-layout
+openvidu.recording.autostop-timeout: 120
\ No newline at end of file
diff --git a/openvidu-server/src/main/resources/application.properties b/openvidu-server/src/main/resources/application.properties
index b176befe..c9ed5cad 100644
--- a/openvidu-server/src/main/resources/application.properties
+++ b/openvidu-server/src/main/resources/application.properties
@@ -19,6 +19,7 @@ openvidu.recording.path: /opt/openvidu/recordings
 openvidu.recording.public-access: false
 openvidu.recording.notification: publisher_moderator
 openvidu.recording.custom-layout: /opt/openvidu/custom-layout
+openvidu.recording.autostop-timeout: 120
 
 openvidu.streams.video.max-recv-bandwidth: 1000
 openvidu.streams.video.min-recv-bandwidth: 300