diff --git a/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java b/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
index 4e083029ce9..9d4645e1fd0 100644
--- a/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
+++ b/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
@@ -50,7 +50,7 @@ public class SmartAutoRotateBatterySaverController extends BasePreferenceControl
             if (mPreference == null) {
                 return;
             }
-            mPreference.setVisible(isPowerSaveMode());
+            mPreference.setVisible(isAvailable());
             updateState(mPreference);
         }
     };
diff --git a/src/com/android/settings/display/SmartAutoRotateCameraStateController.java b/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
index a17a903532e..39576a9dfee 100644
--- a/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
+++ b/src/com/android/settings/display/SmartAutoRotateCameraStateController.java
@@ -45,7 +45,7 @@ public class SmartAutoRotateCameraStateController extends BasePreferenceControll
         mPrivacyManager = SensorPrivacyManager.getInstance(context);
         mPrivacyManager.addSensorPrivacyListener(CAMERA, (sensor, enabled) -> {
             if (mPreference != null) {
-                mPreference.setVisible(enabled);
+                mPreference.setVisible(isAvailable());
             }
             updateState(mPreference);
         });