diff --git a/helix-rest/src/main/java/org/apache/helix/rest/clusterMaintenanceService/MaintenanceManagementService.java b/helix-rest/src/main/java/org/apache/helix/rest/clusterMaintenanceService/MaintenanceManagementService.java
index 77b64d9765..52377e612f 100644
--- a/helix-rest/src/main/java/org/apache/helix/rest/clusterMaintenanceService/MaintenanceManagementService.java
+++ b/helix-rest/src/main/java/org/apache/helix/rest/clusterMaintenanceService/MaintenanceManagementService.java
@@ -486,7 +486,10 @@ private List<String> batchCustomInstanceStoppableCheck(String clusterId, List<St
       return instances;
     }
     RESTConfig restConfig = _configAccessor.getRESTConfig(clusterId);
-    if (restConfig == null) {
+    if (restConfig == null && (
+        !_skipHealthCheckCategories.contains(StoppableCheck.Category.CUSTOM_INSTANCE_CHECK)
+            || !_skipHealthCheckCategories.contains(
+            StoppableCheck.Category.CUSTOM_PARTITION_CHECK))) {
       String errorMessage = String.format(
           "The cluster %s hasn't enabled client side health checks yet, "
               + "thus the stoppable check result is inaccurate", clusterId);
diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/AbstractTestClass.java b/helix-rest/src/test/java/org/apache/helix/rest/server/AbstractTestClass.java
index 71fdc76cff..68561ce839 100644
--- a/helix-rest/src/test/java/org/apache/helix/rest/server/AbstractTestClass.java
+++ b/helix-rest/src/test/java/org/apache/helix/rest/server/AbstractTestClass.java
@@ -564,8 +564,6 @@ private void preSetupForParallelInstancesStoppableTest(String clusterName,
     clusterConfig.setFaultZoneType("helixZoneId");
     clusterConfig.setPersistIntermediateAssignment(true);
     _configAccessor.setClusterConfig(clusterName, clusterConfig);
-    RESTConfig emptyRestConfig = new RESTConfig(clusterName);
-    _configAccessor.setRESTConfig(clusterName, emptyRestConfig);
     // Create instance configs
     List<InstanceConfig> instanceConfigs = new ArrayList<>();
     for (int i = 0; i < instances.size() - 1; i++) {