diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c
index a2c30be..ac063af 100644
--- a/openbsc/src/gprs/gprs_gmm.c
+++ b/openbsc/src/gprs/gprs_gmm.c
@@ -1223,8 +1223,6 @@
 			return 0;
 		}
 
-		gprs_llgmm_reset(llme);
-
 		/* Don't reply or establish a LLME on DETACH_ACK */
 		if (gh->msg_type == GSM48_MT_GMM_DETACH_ACK) {
 			/* TLLI unassignment */
@@ -1232,6 +1230,8 @@
 						 GPRS_ALGO_GEA0, NULL);
 		}
 
+		gprs_llgmm_reset(llme);
+
 		/* Don't force it into re-attachment */
 		if (gh->msg_type == GSM48_MT_GMM_DETACH_REQ) {
 			/* Handle Detach Request */