diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c
index 490371f..781be3f 100644
--- a/openbsc/src/gprs/gprs_sgsn.c
+++ b/openbsc/src/gprs/gprs_sgsn.c
@@ -196,9 +196,7 @@
 
 	/* Detach from subscriber which is possibly freed then */
 	if (mm->subscr) {
-		struct gsm_subscriber *subscr =  mm->subscr;
-		mm->subscr = NULL;
-		subscr->sgsn_data->mm = NULL;
+		struct gsm_subscriber *subscr = subscr_get(mm->subscr);
 		gprs_subscr_cleanup(subscr);
 		subscr_put(subscr);
 	}