diff --git a/src/network.c b/src/network.c
index 79f3bd33..d81a201d 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1823,6 +1823,9 @@ static void network_unset_hotspot(struct network *network, void *user_data)
 		return;
 
 	network_set_info(network, NULL);
+
+	l_queue_destroy(network->secrets, eap_secret_info_free);
+	network->secrets = NULL;
 }
 
 static void emit_known_network_removed(struct station *station, void *user_data)
@@ -1841,6 +1844,9 @@ static void emit_known_network_removed(struct station *station, void *user_data)
 			return;
 
 		network_set_info(network, NULL);
+
+		l_queue_destroy(network->secrets, eap_secret_info_free);
+		network->secrets = NULL;
 	}
 
 	connected_network = station_get_connected_network(station);
@@ -1849,9 +1855,6 @@ static void emit_known_network_removed(struct station *station, void *user_data)
 
 	if (network && was_hidden)
 		station_hide_network(station, network);
-
-	l_queue_destroy(network->secrets, eap_secret_info_free);
-	network->secrets = NULL;
 }
 
 static void network_update_hotspot(struct network *network, void *user_data)