diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
index af504d996c..1b0101542b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
@@ -16,6 +16,7 @@
             $scope.activeTabAlias = null;
             $scope.tabs = [];
             $scope.allowUpdate = $scope.content.allowedActions.includes('A');
+            $scope.allowEditInvariantFromNonDefault = Umbraco.Sys.ServerVariables.umbracoSettings.allowEditInvariantFromNonDefault;
 
             $scope.$watchCollection('content.tabs', (newValue) => {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index c167517227..3827c17c62 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -17,7 +17,7 @@
                     <umb-property-editor
                         model="property"
                         preview="propertyEditorDisabled(property)"
-                        allow-unlock="allowUpdate"
+                        allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
                         on-unlock="unlockInvariantValue(property)"
                         ng-attr-readonly="{{!allowUpdate || undefined}}">
                     </umb-property-editor>
@@ -50,7 +50,7 @@
                         model="property"
                         preview="propertyEditorDisabled(property)"
                         on-unlock="unlockInvariantValue(property)"
-                        allow-unlock="allowUpdate"
+                        allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
                         ng-attr-readonly="{{!allowUpdate || undefined}}">
                     </umb-property-editor>