diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java index 6561eb8ee5..e31cfeba6f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java @@ -207,7 +207,9 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi final Set serviceSet = new HashSet<>(toDisable); for (final ControllerServiceNode nodeToDisable : toDisable) { - nodeToDisable.verifyCanDisable(serviceSet); + if (nodeToDisable.isActive()) { + nodeToDisable.verifyCanDisable(serviceSet); + } } Collections.reverse(toDisable); @@ -593,7 +595,9 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi final Set serviceSet = new HashSet<>(toDisable); for (final ControllerServiceNode nodeToDisable : toDisable) { - nodeToDisable.verifyCanDisable(serviceSet); + if (nodeToDisable.isActive()) { + nodeToDisable.verifyCanDisable(serviceSet); + } } }