diff --git a/plugins/mbm.c b/plugins/mbm.c
index db70f168..04e6623e 100644
--- a/plugins/mbm.c
+++ b/plugins/mbm.c
@@ -91,12 +91,12 @@ static void mbm_remove(struct ofono_modem *modem)
 
 	ofono_modem_set_data(modem, NULL);
 
+	/* Cleanup potential SIM state polling */
+	at_util_sim_state_query_free(data->sim_state_query);
+
 	g_at_chat_unref(data->data_port);
 	g_at_chat_unref(data->modem_port);
 
-	if (data->sim_state_query)
-		at_util_sim_state_query_free(data->sim_state_query);
-
 	g_free(data);
 }