diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx
index 3b7c6a029..e3fd1bb3a 100644
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -1144,7 +1144,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       }
     }
 
-    if (this.shouldShowComputedPropertiesEditor) {
+    if (
+      this.shouldShowComputedPropertiesEditor &&
+      userContext.authType === AuthType.AAD &&
+      !userContext.features.enableSDKoperations
+    ) {
       tabs.push({
         tab: SettingsV2TabTypes.ComputedPropertiesTab,
         content: <ComputedPropertiesComponent {...computedPropertiesComponentProps} />,