diff --git a/openbsc/src/gprs/gprs_subscriber.c b/openbsc/src/gprs/gprs_subscriber.c
index e971210..271cc78 100644
--- a/openbsc/src/gprs/gprs_subscriber.c
+++ b/openbsc/src/gprs/gprs_subscriber.c
@@ -536,10 +536,7 @@
 	if (!gsup_msg.imsi[0])
 		return -GMM_CAUSE_INV_MAND_INFO;
 
-	if (gsup_msg.message_type == GPRS_GSUP_MSGT_INSERT_DATA_REQUEST)
-		subscr = gprs_subscr_get_or_create(gsup_msg.imsi);
-	else
-		subscr = gprs_subscr_get_by_imsi(gsup_msg.imsi);
+	subscr = gprs_subscr_get_by_imsi(gsup_msg.imsi);
 
 	if (!subscr)
 		return gprs_subscr_handle_unknown_imsi(&gsup_msg);
diff --git a/openbsc/tests/sgsn/sgsn_test.c b/openbsc/tests/sgsn/sgsn_test.c
index 7050a16..c09b169 100644
--- a/openbsc/tests/sgsn/sgsn_test.c
+++ b/openbsc/tests/sgsn/sgsn_test.c
@@ -573,8 +573,7 @@
 	/* Inject InsertSubscrData GSUP message (unknown IMSI) */
 	last_updated_subscr = NULL;
 	rc = rx_gsup_message(insert_data_req, sizeof(insert_data_req));
-	/* TODO: Remove the comments when this is fixed */
-	/* OSMO_ASSERT(rc == -GMM_CAUSE_IMSI_UNKNOWN); */
+	OSMO_ASSERT(rc == -GMM_CAUSE_IMSI_UNKNOWN);
 	OSMO_ASSERT(last_updated_subscr == NULL);
 
 	/* Inject DeleteSubscrData GSUP message (unknown IMSI) */