diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index 4f84aabe9d37a..978d821ec0db5 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -735,6 +735,8 @@ public class WifiStateTracker extends NetworkStateTracker {
                 mRunState = RUN_STATE_RUNNING;
                 noteRunState();
                 checkUseStaticIp();
+                /* Reset notification state on new connection */
+                resetNotificationTimer();
                 /*
                  * DHCP requests are blocking, so run them in a separate thread.
                  */