diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index 2ab7c128046..b57971116ee 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -229,8 +229,7 @@ && instances().stream()
                                                 .anyMatch(endpoint -> ! endpoint.isPublicEndpoint()))) return ZoneEndpoint.privateEndpoint;
 
         if (zone.environment().isManuallyDeployed())
-            return instance(instance).filter(spec -> spec.deploysTo(zone.environment(), zone.region()))
-                                     .map(spec -> spec.zoneEndpoints().getOrDefault(cluster, Map.of()).get(null))
+            return instance(instance).map(spec -> spec.zoneEndpoints().getOrDefault(cluster, Map.of()).get(null))
                                      .orElse(ZoneEndpoint.defaultEndpoint);
 
         if (zone.environment() != Environment.prod) return ZoneEndpoint.defaultEndpoint;
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index d950970f0bb..18d3b4a7406 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -1235,17 +1235,11 @@ public void someEndpoints() {
                                                 <dev />
                                              </instance>
                                              <instance id='other'>
-                                               <dev />
                                                <perf />
                                                <endpoints>
                                                  <endpoint container-id='pew' type='private' />
                                                </endpoints>
                                              </instance>
-                                             <instance id='last'>
-                                               <endpoints>
-                                                 <endpoint container-id='pew' type='private' />
-                                               </endpoints>
-                                             </instance>
                                           </deployment>""");
 
         assertEquals(
@@ -1282,7 +1276,7 @@ public void someEndpoints() {
 
         assertEquals(ZoneEndpoint.defaultEndpoint,
                      spec.zoneEndpoint(InstanceName.from("default"), perfZone, ClusterSpec.Id.from("bax")));
-        assertEquals(ZoneEndpoint.defaultEndpoint,
+        assertEquals(ZoneEndpoint.privateEndpoint,
                      spec.zoneEndpoint(InstanceName.from("default"), perfZone, ClusterSpec.Id.from("froz")));
 
         assertEquals(new ZoneEndpoint(false, true, List.of(new AllowedUrn(AccessType.awsPrivateLink, "barn"),
@@ -1293,11 +1287,6 @@ public void someEndpoints() {
                      spec.zoneEndpoint(InstanceName.from("other"), devZone, ClusterSpec.Id.from("pew")));
         assertEquals(new ZoneEndpoint(true, true, List.of()),
                      spec.zoneEndpoint(InstanceName.from("other"), perfZone, ClusterSpec.Id.from("pew")));
-
-        assertEquals(ZoneEndpoint.defaultEndpoint,
-                     spec.zoneEndpoint(InstanceName.from("last"), devZone, ClusterSpec.Id.from("pew")));
-        assertEquals(ZoneEndpoint.defaultEndpoint,
-                     spec.zoneEndpoint(InstanceName.from("last"), perfZone, ClusterSpec.Id.from("pew")));
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 60ea37cad3f..74b0f3b304f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -303,7 +303,7 @@ void load_balancers_can_be_set() throws IOException, SAXException {
                           "us",
                           ZoneEndpoint.defaultEndpoint);
 
-        // Various settings, but wrong environment
+        // Various settings, but wrong environment for private services
         verifyAllowedUrns("""
                           <endpoint type='zone' container-id='default' enabled='false' />
                           <endpoint type='private' container-id='default'>
@@ -314,7 +314,7 @@ void load_balancers_can_be_set() throws IOException, SAXException {
                           """,
                           Environment.dev,
                           "eu",
-                          ZoneEndpoint.defaultEndpoint);
+                          ZoneEndpoint.privateEndpoint);
     }
 
     private void verifyAllowedUrns(String endpointsTag, Environment environment, String region, ZoneEndpoint expected) throws IOException, SAXException {