Control by application.

1 files changed, 2 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 632ae4a03a1..870a91f8b45 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -160,7 +160,7 @@ public class ModelContextImpl implements ModelContext {
             this.useFdispatchByDefault = Flags.USE_FDISPATCH_BY_DEFAULT.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource)
-                    .with(FetchVector.Dimension.ZONE_ID, zone.toString()).value();
+                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
         }
 
         @Override
@@ -206,7 +206,7 @@ public class ModelContextImpl implements ModelContext {
         @Override
         public boolean useFdispatchByDefault() { return useFdispatchByDefault; }
         @Override
-        public boolean useAdaptiveDispatch() { return useFdispatchByDefault; }
+        public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; }
     }
 
 }