Remove also if no zone

1 files changed, 3 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 7fecf514ba7..530516b8e26 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -382,10 +382,10 @@ public class ApplicationController {
     private Application deleteUnreferencedDeploymentJobs(Application application) {
         for (DeploymentJobs.JobType job : application.deploymentJobs().jobStatus().keySet()) {
             Optional<Zone> zone = job.zone(controller.system());
-            if ( ! zone.isPresent()) continue;
 
-            if ( ! application.deploymentSpec().includes(zone.get().environment(), zone.map(Zone::region)))
-                application = application.withoutDeploymentJob(job);
+            if ( ! job.isProduction() || (zone.isPresent() && application.deploymentSpec().includes(zone.get().environment(), zone.map(Zone::region))))
+                continue;
+            application = application.withoutDeploymentJob(job);
         }
         return application;
     }