diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp
index 091c6c2..e03dd35 100644
--- a/src/tabcontrollers/MoveCenterTabController.cpp
+++ b/src/tabcontrollers/MoveCenterTabController.cpp
@@ -74,8 +74,6 @@ void MoveCenterTabController::initStage1()
 
     m_momentumSave
         = settings::getSetting( settings::BoolSetting::PLAYSPACE_momentumSave );
-    m_lockYToggle
-        = settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle );
     m_showLogMatricesButton = settings::getSetting(
         settings::BoolSetting::PLAYSPACE_showLogMatricesButton );
     m_allowExternalEdits = settings::getSetting(
@@ -255,10 +253,6 @@ void MoveCenterTabController::outputLogSettings()
         LOG( INFO ) << "LOADED SETTINGS: Space-Turn Comfort Factor = "
                     << m_turnComfortFactor;
     }
-    if ( m_lockYToggle )
-    {
-        LOG( INFO ) << "LOADED SETTINGS: Y Axis Locked";
-    }
     if ( m_allowExternalEdits )
     {
         LOG( INFO ) << "LOADED SETTINGS: Allow External Edits Enabled";
@@ -978,20 +972,15 @@ void MoveCenterTabController::setLockX( bool value, bool notify )
 
 bool MoveCenterTabController::lockYToggle() const
 {
-    return m_lockYToggle;
+    return settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle );
 }
 
 void MoveCenterTabController::setLockY( bool value, bool notify )
 {
-    m_lockYToggle = value;
-    auto settings = OverlayController::appSettings();
-    settings->beginGroup( "playspaceSettings" );
-    settings->setValue( "lockYToggle", m_lockYToggle );
-    settings->endGroup();
-    settings->sync();
+    settings::setSetting( settings::BoolSetting::PLAYSPACE_lockYToggle, value );
     if ( notify )
     {
-        emit requireLockYChanged( m_lockYToggle );
+        emit requireLockYChanged( value );
     }
 }
 
@@ -1161,7 +1150,7 @@ void MoveCenterTabController::modOffsetX( float value, bool notify )
 
 void MoveCenterTabController::modOffsetY( float value, bool notify )
 {
-    if ( !m_lockYToggle )
+    if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle ) )
     {
         m_offsetY += value;
         if ( notify )
@@ -2290,7 +2279,7 @@ void MoveCenterTabController::yAxisLockToggle( bool yAxisLockToggleJustPressed )
         return;
     }
 
-    if ( !m_lockYToggle )
+    if ( !settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle ) )
     {
         setLockY( true );
     }
@@ -2475,7 +2464,8 @@ void MoveCenterTabController::updateHandDrag(
         {
             m_offsetX += static_cast<float>( diff[0] );
         }
-        if ( !m_lockYToggle )
+        if ( !settings::getSetting(
+                 settings::BoolSetting::PLAYSPACE_lockYToggle ) )
         {
             m_offsetY += static_cast<float>( diff[1] );
         }
@@ -2611,7 +2601,7 @@ void MoveCenterTabController::updateGravity()
     {
         m_velocity[0] = 0.0;
     }
-    if ( m_lockYToggle )
+    if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle ) )
     {
         m_velocity[1] = 0.0;
     }
diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h
index 7e4f1d6..f7571f9 100644
--- a/src/tabcontrollers/MoveCenterTabController.h
+++ b/src/tabcontrollers/MoveCenterTabController.h
@@ -140,7 +140,6 @@ private:
     float m_gravityStrength = 9.8f;
     float m_flingStrength = 1.0f;
     bool m_momentumSave = false;
-    bool m_lockYToggle = false;
     // Set lastHandQuaternion.w to -1000.0 when last hand is invalid.
     vr::HmdQuaternion_t m_lastHandQuaternion
         = { k_quaternionInvalidValue, 0.0, 0.0, 0.0 };