diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index 7deca65b0..a0d008da5 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -128,10 +128,13 @@ void assignment_reset(struct gsm_subscriber_connection *conn)
 	}
 
 	if (conn->assignment.created_ci_for_msc) {
-		gscon_forget_mgw_endpoint_ci(conn, conn->assignment.created_ci_for_msc);
+		/* Store ci pointer locally, because gscon_forget_mgw_endpoint_ci() NULLs
+		 * conn->assignment.created_ci_for_msc. */
+		struct osmo_mgcpc_ep_ci *ci = conn->assignment.created_ci_for_msc;
+		gscon_forget_mgw_endpoint_ci(conn, ci);
 		/* If this is the last endpoint released, the mgw_endpoint_fsm will terminate and tell
 		 * the gscon about it. */
-		osmo_mgcpc_ep_ci_dlcx(conn->assignment.created_ci_for_msc);
+		osmo_mgcpc_ep_ci_dlcx(ci);
 	}
 
 	conn->assignment = (struct assignment_fsm_data){
diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 54d39759d..9af28c787 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -955,6 +955,9 @@ void gscon_forget_mgw_endpoint_ci(struct gsm_subscriber_connection *conn, struct
 
 	if (conn->user_plane.mgw_endpoint_ci_msc == ci)
 		conn->user_plane.mgw_endpoint_ci_msc = NULL;
+
+	if (conn->assignment.created_ci_for_msc == ci)
+		conn->assignment.created_ci_for_msc = NULL;
 }
 
 static void gscon_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)