diff --git a/repair/repair.cc b/repair/repair.cc
index bf42d4ff1e..1b7db4853c 100644
--- a/repair/repair.cc
+++ b/repair/repair.cc
@@ -1053,6 +1053,10 @@ static int do_repair_start(seastar::sharded<database>& db, sstring keyspace,
     repair_tracker.start(id);
     auto fail = defer([id] { repair_tracker.done(id, false); });
 
+    if (!gms::get_local_gossiper().is_normal(utils::fb_utilities::get_broadcast_address())) {
+        throw std::runtime_error("Node is not in NORMAL status yet!");
+    }
+
     // If the "ranges" option is not explicitly specified, we repair all the
     // local ranges (the token ranges for which this node holds a replica of).
     // Each of these ranges may have a different set of replicas, so the