diff --git a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js
index 29f14a74a..7517df4b8 100644
--- a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js
+++ b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js
@@ -2,11 +2,11 @@
 define(
     [
         'underscore',
-        'vent',
         'marionette',
+        'Config',
         'Settings/MediaManagement/Naming/NamingSampleModel',
         'Mixins/AsModelBoundView'
-    ], function (_, vent, Marionette, NamingSampleModel, AsModelBoundView) {
+    ], function (_, Marionette, Config, NamingSampleModel, AsModelBoundView) {
 
         var view = Marionette.ItemView.extend({
             template: 'Settings/MediaManagement/Naming/Basic/BasicNamingViewTemplate',
@@ -35,6 +35,10 @@ define(
             },
 
             _buildFormat: function () {
+                if (Config.getValueBoolean(Config.Keys.AdvancedSettings)) {
+                    return;
+                }
+
                 if (_.has(this.model.changed, 'standardEpisodeFormat') || _.has(this.model.changed, 'dailyEpisodeFormat')) {
                     return;
                 }
diff --git a/src/UI/Settings/MediaManagement/Naming/NamingView.js b/src/UI/Settings/MediaManagement/Naming/NamingView.js
index 14229fd41..ab0c91a7b 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingView.js
+++ b/src/UI/Settings/MediaManagement/Naming/NamingView.js
@@ -3,12 +3,11 @@ define(
     [
         'underscore',
         'marionette',
-        'Config',
         'Settings/MediaManagement/Naming/NamingSampleModel',
         'Settings/MediaManagement/Naming/Basic/BasicNamingView',
         'Mixins/AsModelBoundView',
         'Mixins/AsValidatedView'
-    ], function (_, Marionette, Config, NamingSampleModel, BasicNamingView, AsModelBoundView, AsValidatedView) {
+    ], function (_, Marionette, NamingSampleModel, BasicNamingView, AsModelBoundView, AsValidatedView) {
 
         var view = Marionette.Layout.extend({
             template: 'Settings/MediaManagement/Naming/NamingViewTemplate',
diff --git a/src/UI/Settings/SettingsLayout.js b/src/UI/Settings/SettingsLayout.js
index 122d84307..c8066d71b 100644
--- a/src/UI/Settings/SettingsLayout.js
+++ b/src/UI/Settings/SettingsLayout.js
@@ -245,4 +245,3 @@ define(
             }
         });
     });
-