diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/RepairTool.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/RepairTool.java
index e3255a4a4261..c6a718ee30b5 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/RepairTool.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/RepairTool.java
@@ -53,7 +53,8 @@ protected Component serviceToBeOffline() {
 
   @Override
   public final Void call() throws Exception {
-    if (!dryRun) {
+    final Component service = serviceToBeOffline();
+    if (!dryRun && service != null) { // offline tool
       confirmUser();
     }
     if (isServiceStateOK()) {