diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 971906e083..83c86e7429 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -1497,6 +1497,8 @@ _clear_plugin (NMDnsManager *self)
 		g_clear_object (&priv->plugin);
 		return TRUE;
 	}
+	priv->plugin_ratelimit.ts = 0;
+	nm_clear_g_source (&priv->plugin_ratelimit.timer);
 	return FALSE;
 }
 
@@ -1686,6 +1688,8 @@ dispose (GObject *object)
 		priv->configs = NULL;
 	}
 
+	nm_clear_g_source (&priv->plugin_ratelimit.timer);
+
 	G_OBJECT_CLASS (nm_dns_manager_parent_class)->dispose (object);
 }