diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index cdafd9ee5d1cb..6b4c580e79782 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2957,8 +2957,8 @@ public class WifiStateMachine extends StateMachine {
 
             if (mOperationalMode != CONNECT_MODE) {
                 mWifiNative.disconnect();
+                mWifiConfigStore.disableAllNetworks();
                 if (mOperationalMode == SCAN_ONLY_WITH_WIFI_OFF_MODE) {
-                    mWifiConfigStore.disableAllNetworks();
                     setWifiState(WIFI_STATE_DISABLED);
                 }
                 transitionTo(mScanModeState);