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;
 }