diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c
index ec48eda..1af9631 100644
--- a/src/gb/gprs_ns2_sns.c
+++ b/src/gb/gprs_ns2_sns.c
@@ -812,7 +812,6 @@
 		}
 
 		gss->num_ip4_local = count;
-		gss->num_max_ip4_remote = 4;
 		gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip4_remote * gss->num_ip4_local, 8);
 		break;
 	case IPv6:
@@ -849,7 +848,6 @@
 			ip6_elems++;
 		}
 		gss->num_ip6_local = count;
-		gss->num_max_ip6_remote = 4;
 		gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip6_remote * gss->num_ip6_local, 8);
 		break;
 	}
@@ -1560,6 +1558,9 @@
 	fi->priv = gss;
 	gss->nse = nse;
 	gss->role = GPRS_SNS_ROLE_BSS;
+	/* The SGSN doesn't tell the BSS, so we assume there's always sufficient */
+	gss->num_max_ip4_remote = 8192;
+	gss->num_max_ip6_remote = 8192;
 	INIT_LLIST_HEAD(&gss->sns_endpoints);
 	INIT_LLIST_HEAD(&gss->binds);