diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java
index 572f553e7a..53e009ed37 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMScheduler.java
@@ -66,7 +66,7 @@ public class JBPMScheduler extends AbstractLifecycleBean
     @Override
     protected void onShutdown(ApplicationEvent event)
     {
-    	if(JbpmEngineEnabled || executor.isStarted())
+    	if(JbpmEngineEnabled && executor.isStarted())
     	{
     		executor.stop();
     	}