diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
index 8ed48c2c385..7c02a7728dc 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
@@ -324,18 +324,19 @@ public class CrshAutoConfiguration {
 		protected boolean shouldFilter(CRaSHPlugin<?> plugin) {
 			Assert.notNull(plugin);
 
+			if (this.disabledPlugins == null || this.disabledPlugins.length == 0) {
+				return false;
+			}
+
 			Set<Class> classes = ClassUtils.getAllInterfacesAsSet(plugin);
 			classes.add(plugin.getClass());
 
 			for (Class<?> clazz : classes) {
-				if (this.disabledPlugins != null && this.disabledPlugins.length > 0) {
-					for (String disabledPlugin : this.disabledPlugins) {
-						if (ClassUtils.getShortName(clazz).equalsIgnoreCase(
-								disabledPlugin)
-								|| ClassUtils.getQualifiedName(clazz).equalsIgnoreCase(
-										disabledPlugin)) {
-							return true;
-						}
+				for (String disabledPlugin : this.disabledPlugins) {
+					if (ClassUtils.getShortName(clazz).equalsIgnoreCase(disabledPlugin)
+							|| ClassUtils.getQualifiedName(clazz).equalsIgnoreCase(
+									disabledPlugin)) {
+						return true;
 					}
 				}
 			}