diff --git a/lib/configuration/hooks/studio/index.js b/lib/configuration/hooks/studio/index.js
index 3542eaeed6..017906c621 100644
--- a/lib/configuration/hooks/studio/index.js
+++ b/lib/configuration/hooks/studio/index.js
@@ -43,7 +43,7 @@ module.exports = function (strapi) {
       const _self = this;
       let firstConnectionAttempt = true;
 
-      if (_.isPlainObject(strapi.config.studio) && !_.isEmpty(strapi.config.studio)) {
+      if (_.isPlainObject(strapi.config.studio) && !_.isEmpty(strapi.config.studio) && strapi.config.studio.enabled === true) {
         const manager = io.Manager(strapi.config.studio.url, {
           reconnectionDelay: 2000,
           reconnectionDelayMax: 5000,
@@ -244,6 +244,8 @@ module.exports = function (strapi) {
           strapi.log.warn(data.text);
         });
 
+        cb();
+      } else {
         cb();
       }
     },