diff --git a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
index 955f747fa78..9b7a85146ff 100644
--- a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
+++ b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
@@ -61,7 +61,8 @@ public class CameraLiftTriggerPreferenceController extends GesturePreferenceCont
     @Override
     protected boolean isSwitchPrefEnabled() {
         final int triggerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, 0);
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED,
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT);
         return triggerEnabled == 1;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
index c3c93798483..8cd92a44153 100644
--- a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
@@ -74,6 +74,15 @@ public class CameraLiftTriggerPreferenceControllerTest {
         assertThat(mController.isAvailable()).isFalse();
     }
 
+    @Test
+    public void testSwitchEnabled_defaultConfig_shouldReturnTrue() {
+        final Context context = RuntimeEnvironment.application;
+        mController = new CameraLiftTriggerPreferenceController(context, null,
+                KEY_CAMERA_LIFT_TRIGGER);
+
+        assertThat(mController.isSwitchPrefEnabled()).isTrue();
+    }
+
     @Test
     public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
         // Set the setting to be enabled.