diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index fdf06c0c8..ce33d0c0b 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -1124,6 +1124,10 @@ scan:
 		}
 	}
 
+	/* If there is no more ssids, start next time from the beginning */
+	if (!ssid)
+		wpa_s->prev_sched_ssid = NULL;
+
 	return 0;
 }