diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index df663bc..38af84c 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -880,7 +880,6 @@ int wpa_supplicant_req_sched_scan(struct wpa_supplicant *wpa_s)
                 wpa_s->sched_scan_timeout = max_sched_scan_ssids * 2;
                 wpa_s->first_sched_scan = 1;
                 ssid = wpa_s->conf->ssid;
-               wpa_s->prev_sched_ssid = ssid;
         }

         if (wildcard) {
@@ -929,11 +928,12 @@ int wpa_supplicant_req_sched_scan(struct wpa_supplicant *wpa_s)
                                          (wpas_network_disabled(wpa_s, ssid) ||
                                           !ssid->scan_ssid));
                                 break;
+                               if (!ssid)
+                                       wpa_s->prev_sched_ssid = NULL;
                         }
                 }

         next:
-               wpa_s->prev_sched_ssid = ssid;
                 ssid = ssid->next;
         }