diff --git a/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js b/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js
index f51619131d..308b772feb 100644
--- a/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js
+++ b/packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js
@@ -78,17 +78,15 @@ module.exports = {
       try {
         fs.writeFileSync(modelFilePath, JSON.stringify(modelJSON, null, 2), 'utf8');
         
-        const response = () => {
-          ctx.send({ ok: true });
-
-          strapi.reload();
-        };
-
         if (_.isEmpty(strapi.api)) {
-          strapi.emit('didCreateFirstContentType', response);
+          strapi.emit('didCreateFirstContentType');
         } else {
-          strapi.emit('didCreateContentType', response);
+          strapi.emit('didCreateContentType');
         }
+        
+        ctx.send({ ok: true });
+        
+        setImmediate(() => strapi.reload());
       } catch (e) {
         strapi.emit('didNotCreateContentType', e);
         return ctx.badRequest(null, [{ messages: [{ id: 'request.error.model.write' }] }]);