diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c
index ec639dc..a2d61cf 100644
--- a/openbsc/src/gprs/gprs_gmm.c
+++ b/openbsc/src/gprs/gprs_gmm.c
@@ -808,6 +808,8 @@
 	gprs_llgmm_assign(ctx->llme, ctx->tlli, 0xffffffff,
 			  GPRS_ALGO_GEA0, NULL);
 
+	sgsn_mm_ctx_free(ctx);
+
 	return rc;
 }
 
@@ -1575,6 +1577,8 @@
 		break;
 	}
 
+	/* MMCTX can be invalid */
+
 	return rc;
 }
 
diff --git a/openbsc/tests/sgsn/sgsn_test.c b/openbsc/tests/sgsn/sgsn_test.c
index 30ed1d9..a38b146 100644
--- a/openbsc/tests/sgsn/sgsn_test.c
+++ b/openbsc/tests/sgsn/sgsn_test.c
@@ -141,9 +141,7 @@
 	/* verify that things are gone */
 	OSMO_ASSERT(count(gprs_llme_list()) == 0);
 	ictx = sgsn_mm_ctx_by_tlli(local_tlli, &raid);
-	/* this is still wrong and needs to be changed */
-	OSMO_ASSERT(ictx);
-	OSMO_ASSERT(ictx->llme == lle->llme);
+	OSMO_ASSERT(!ictx);
 }
 
 static struct log_info_cat gprs_categories[] = {