diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index b9ec94c..f42ae1b 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -730,6 +730,9 @@
 	/* MSC data in case we are a true BSC */
 	struct osmo_msc_data *msc_data;
 	int hardcoded_rtp_payload;
+
+	/* subscriber related features */
+	int keep_subscr;
 };
 
 #define SMS_HDR_SIZE	128
diff --git a/openbsc/src/gsm_subscriber_base.c b/openbsc/src/gsm_subscriber_base.c
index 3136ebe..e3a04f3 100644
--- a/openbsc/src/gsm_subscriber_base.c
+++ b/openbsc/src/gsm_subscriber_base.c
@@ -86,7 +86,7 @@
 	subscr->use_count--;
 	DEBUGP(DREF, "subscr %s usage decreased usage to: %d\n",
 			subscr->extension, subscr->use_count);
-	if (subscr->use_count <= 0)
+	if (subscr->use_count <= 0 && !subscr->net->keep_subscr)
 		subscr_free(subscr);
 	return NULL;
 }