diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c
index 16b0211fa2..b643d5412e 100644
--- a/src/core/nm-policy.c
+++ b/src/core/nm-policy.c
@@ -2893,7 +2893,7 @@ dispose(GObject *object)
     }
 
     g_hash_table_iter_init(&h_iter, priv->devices);
-    if (g_hash_table_iter_next(&h_iter, (gpointer *) &device, NULL)) {
+    while (g_hash_table_iter_next(&h_iter, (gpointer *) &device, NULL)) {
         g_hash_table_iter_remove(&h_iter);
         devices_list_unregister(self, device);
     }