diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 6b4c580e79782..b4c583e850767 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -3535,10 +3535,7 @@ public class WifiStateMachine extends StateMachine {
 
         @Override
         public void exit() {
-            // if we're leaving before this is done, cleanup
-            if (mDhcpActive) {
-                handlePostDhcpSetup();
-            }
+            handleNetworkDisconnect();
         }
 
         @Override