diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/LayoutsHttpHandler.java b/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java
similarity index 86%
rename from openvidu-server/src/main/java/io/openvidu/server/recording/LayoutsHttpHandler.java
rename to openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java
index 8e914282..9aa524ce 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/LayoutsHttpHandler.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java
@@ -18,6 +18,7 @@
 package io.openvidu.server.recording;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -25,7 +26,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 import io.openvidu.server.config.OpenviduConfig;
 
 @Configuration
-public class LayoutsHttpHandler extends WebMvcConfigurerAdapter {
+@ConditionalOnProperty(name = "openvidu.recording", havingValue = "true")
+public class CustomLayoutsHttpHandler extends WebMvcConfigurerAdapter {
 
 	@Autowired
 	OpenviduConfig openviduConfig;
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java b/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java
index b2a1b00f..e33dbc1d 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java
@@ -18,6 +18,7 @@
 package io.openvidu.server.recording;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -25,6 +26,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 import io.openvidu.server.config.OpenviduConfig;
 
 @Configuration
+@ConditionalOnProperty(name = "openvidu.recording", havingValue = "true")
 public class RecordingsHttpHandler extends WebMvcConfigurerAdapter {
 
 	@Autowired