diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c
index 7bacb738..7c58b24d 100644
--- a/drivers/ifxmodem/gprs-context.c
+++ b/drivers/ifxmodem/gprs-context.c
@@ -354,6 +354,9 @@ static void cgcontrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
 
 	DBG("DNS: %s, %s\n", gcd->dns1, gcd->dns2);
 
+	if (gw)
+		l_strlcpy(gcd->gateway, gw, sizeof(gcd->gateway));
+
 	if (gcd->proto == OFONO_GPRS_PROTO_IP) {
 		if (!laddrnetmask ||
 			at_util_get_ipv4_address_and_netmask(laddrnetmask,
@@ -391,9 +394,6 @@ static void cgcontrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
 						IPV6_DEFAULT_PREFIX_LEN);
 	}
 
-	if (gw)
-		l_strlcpy(gcd->gateway, gw, sizeof(gcd->gateway));
-
 	gcd->state = STATE_ACTIVE;
 
 	DBG("address: %s\n", gcd->address);