diff --git a/plugins/huawei.c b/plugins/huawei.c
index 8afc0f58..c57cbb42 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -104,6 +104,10 @@ static void huawei_remove(struct ofono_modem *modem)
 
 	ofono_modem_set_data(modem, NULL);
 
+	/* Cleanup after potential enable polling */
+	if (data->sysinfo_poll_source > 0)
+		g_source_remove(data->sysinfo_poll_source);
+
 	/* Cleanup after hot-unplug */
 	g_at_chat_unref(data->pcui);