diff --git a/plugins/gemalto.c b/plugins/gemalto.c
index 2f842587..297aaea3 100644
--- a/plugins/gemalto.c
+++ b/plugins/gemalto.c
@@ -573,9 +573,6 @@ static void gemalto_pre_sim(struct ofono_modem *modem)
 	ofono_devinfo_create(modem, 0, "atmodem", data->app);
 	ofono_location_reporting_create(modem, 0, "gemaltomodem", data->app);
 
-	ofono_modem_set_integer(modem, "GemaltoVtsQuotes", 1);
-	ofono_voicecall_create(modem, 0, "gemaltomodem", data->app);
-
 	data->sim = ofono_sim_create(modem, OFONO_VENDOR_GEMALTO, "atmodem",
 						data->app);
 
@@ -604,11 +601,6 @@ static void gemalto_post_sim(struct ofono_modem *modem)
 
 	ofono_ussd_create(modem, 0, "atmodem", data->app);
 
-	ofono_call_forwarding_create(modem, 0, "atmodem", data->app);
-	ofono_call_settings_create(modem, 0, "atmodem", data->app);
-	ofono_call_meter_create(modem, 0, "atmodem", data->app);
-	ofono_call_barring_create(modem, 0, "atmodem", data->app);
-
 	if (!g_strcmp0(model, GEMALTO_MODEL_ALS3_PLS8x))
 		ofono_lte_create(modem, OFONO_VENDOR_GEMALTO,
 						"atmodem", data->app);
@@ -621,6 +613,14 @@ static void gemalto_post_online(struct ofono_modem *modem)
 	DBG("%p", modem);
 
 	ofono_netreg_create(modem, OFONO_VENDOR_GEMALTO, "atmodem", data->app);
+
+	ofono_modem_set_integer(modem, "GemaltoVtsQuotes", 1);
+	ofono_voicecall_create(modem, 0, "gemaltomodem", data->app);
+
+	ofono_call_forwarding_create(modem, 0, "atmodem", data->app);
+	ofono_call_settings_create(modem, 0, "atmodem", data->app);
+	ofono_call_meter_create(modem, 0, "atmodem", data->app);
+	ofono_call_barring_create(modem, 0, "atmodem", data->app);
 }
 
 static struct ofono_modem_driver gemalto_driver = {