diff --git a/src/java/org/apache/cassandra/metrics/TCMMetrics.java b/src/java/org/apache/cassandra/metrics/TCMMetrics.java
index 9544c2215a..8b74217bbb 100644
--- a/src/java/org/apache/cassandra/metrics/TCMMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/TCMMetrics.java
@@ -29,7 +29,6 @@ import org.apache.cassandra.gms.FailureDetector;
 import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.tcm.Epoch;
 import org.apache.cassandra.tcm.EpochAwareDebounce;
-import org.apache.cassandra.utils.FBUtilities;
 
 import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
 import static org.apache.cassandra.tcm.transformations.cms.PrepareCMSReconfiguration.needsReconfiguration;
@@ -94,7 +93,7 @@ public class TCMMetrics
 
         isCMSMember = Metrics.register(factory.createMetricName("IsCMSMember"), () -> {
             ClusterMetadata metadata =  ClusterMetadata.currentNullable();
-            return metadata != null && metadata.isCMSMember(FBUtilities.getBroadcastAddressAndPort()) ? 1 : 0;
+            return metadata != null && metadata.isCMSMember() ? 1 : 0;
         });
 
         needsCMSReconfiguration = Metrics.register(factory.createMetricName("NeedsCMSReconfiguration"), () -> {
diff --git a/src/java/org/apache/cassandra/net/ResponseVerbHandler.java b/src/java/org/apache/cassandra/net/ResponseVerbHandler.java
index fb36c67c66..215b575c10 100644
--- a/src/java/org/apache/cassandra/net/ResponseVerbHandler.java
+++ b/src/java/org/apache/cassandra/net/ResponseVerbHandler.java
@@ -30,7 +30,6 @@ import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.tcm.ClusterMetadataService;
 import org.apache.cassandra.tcm.Epoch;
 import org.apache.cassandra.tracing.Tracing;
-import org.apache.cassandra.utils.FBUtilities;
 
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static org.apache.cassandra.exceptions.RequestFailureReason.COORDINATOR_BEHIND;
@@ -98,7 +97,7 @@ class ResponseVerbHandler implements IVerbHandler
         if (SKIP_CATCHUP_FOR.contains(message.verb()))
             return;
 
-        if (metadata.isCMSMember(FBUtilities.getBroadcastAddressAndPort()) && CMS_SKIP_CATCHUP_FOR.contains(message.verb()))
+        if (metadata.isCMSMember() && CMS_SKIP_CATCHUP_FOR.contains(message.verb()))
             return;
 
         // Gossip stage is single-threaded, so we may end up in a deadlock with after-commit hook
diff --git a/src/java/org/apache/cassandra/repair/RepairCoordinator.java b/src/java/org/apache/cassandra/repair/RepairCoordinator.java
index 3ba51e4df6..8aa3482b5e 100644
--- a/src/java/org/apache/cassandra/repair/RepairCoordinator.java
+++ b/src/java/org/apache/cassandra/repair/RepairCoordinator.java
@@ -81,7 +81,6 @@ import org.apache.cassandra.tracing.TraceState;
 import org.apache.cassandra.tracing.Tracing;
 import org.apache.cassandra.transport.Dispatcher;
 import org.apache.cassandra.transport.messages.ResultMessage;
-import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.Pair;
 import org.apache.cassandra.utils.Throwables;
 import org.apache.cassandra.utils.TimeUUID;
@@ -402,7 +401,7 @@ public class RepairCoordinator implements Runnable, ProgressEventNotifier, Repai
         //calculation multiple times
         Iterable<Range<Token>> keyspaceLocalRanges = getLocalReplicas.apply(state.keyspace).ranges();
         boolean isMeta = Keyspace.open(state.keyspace).getMetadata().params.replication.isMeta();
-        boolean isCMS = ClusterMetadata.current().isCMSMember(FBUtilities.getBroadcastAddressAndPort());
+        boolean isCMS = ClusterMetadata.current().isCMSMember();
         for (Range<Token> range : state.options.getRanges())
         {
             EndpointsForRange allForRange = ctx.repair().getNeighbors(state.keyspace, keyspaceLocalRanges, range);
diff --git a/src/java/org/apache/cassandra/tcm/CMSOperations.java b/src/java/org/apache/cassandra/tcm/CMSOperations.java
index 460513fbf5..60f4e67d1a 100644
--- a/src/java/org/apache/cassandra/tcm/CMSOperations.java
+++ b/src/java/org/apache/cassandra/tcm/CMSOperations.java
@@ -48,7 +48,6 @@ import org.apache.cassandra.tcm.sequences.ReconfigureCMS;
 import org.apache.cassandra.tcm.serialization.Version;
 import org.apache.cassandra.tcm.transformations.Unregister;
 import org.apache.cassandra.tcm.transformations.cms.AdvanceCMSReconfiguration;
-import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.MBeanWrapper;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -217,7 +216,7 @@ public class CMSOperations implements CMSOperationsMBean
         String members = metadata.fullCMSMembers().stream().sorted().map(Object::toString).collect(Collectors.joining(","));
         info.put(MEMBERS, members);
         info.put(NEEDS_RECONFIGURATION, Boolean.toString(metadata.epoch.isBefore(Epoch.FIRST) || needsReconfiguration(metadata)));
-        info.put(IS_MEMBER, Boolean.toString(cms.isCurrentMember(FBUtilities.getBroadcastAddressAndPort())));
+        info.put(IS_MEMBER, Boolean.toString(metadata.isCMSMember()));
         info.put(SERVICE_STATE, ClusterMetadataService.state(metadata).toString());
         info.put(IS_MIGRATING, Boolean.toString(cms.isMigrating()));
         info.put(EPOCH, Long.toString(metadata.epoch.getEpoch()));
diff --git a/src/java/org/apache/cassandra/tcm/ClusterMetadata.java b/src/java/org/apache/cassandra/tcm/ClusterMetadata.java
index 4132c900eb..4110e80801 100644
--- a/src/java/org/apache/cassandra/tcm/ClusterMetadata.java
+++ b/src/java/org/apache/cassandra/tcm/ClusterMetadata.java
@@ -237,13 +237,20 @@ public class ClusterMetadata
         return cmsMembership.fullMembers();
     }
 
+    public boolean isCMSMember()
+    {
+        if (epoch.isEqualOrBefore(Epoch.FIRST))
+            return isCMSMember(FBUtilities.getBroadcastAddressAndPort());
+
+        return fullCMSMemberIds().contains(localNodeId);
+    }
+
     public boolean isCMSMember(InetAddressAndPort endpoint)
     {
-        if (epoch.isAfter(Epoch.FIRST))
-            return fullCMSMembers().contains(endpoint);
+        if (epoch.isEqualOrBefore(Epoch.FIRST))
+            return cmsDataPlacement.reads.byEndpoint().keySet().contains(endpoint);
 
-        // special case to handle initialization of the CMS for the first time
-        return cmsDataPlacement.reads.byEndpoint().keySet().contains(endpoint);
+        return fullCMSMembers().contains(endpoint);
     }
 
     public Set<InetAddressAndPort> fullCMSMembers()
diff --git a/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java b/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java
index 5c235257de..08fadb2aa8 100644
--- a/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java
+++ b/src/java/org/apache/cassandra/tcm/ClusterMetadataService.java
@@ -176,7 +176,7 @@ public class ClusterMetadataService
         // The node is a full member of the CMS if it has started participating in reads for distributed metadata table (which
         // implies it is a write replica as well). In other words, it's a fully joined member of the replica set responsible for
         // the distributed metadata table.
-        if (metadata.epoch.isEqualOrBefore(Epoch.FIRST) || ClusterMetadata.current().isCMSMember(FBUtilities.getBroadcastAddressAndPort()))
+        if (metadata.epoch.isEqualOrBefore(Epoch.FIRST) || metadata.isCMSMember())
             return LOCAL;
 
         return REMOTE;
@@ -1103,6 +1103,6 @@ public class ClusterMetadataService
 
     public enum State
     {
-        LOCAL, REMOTE, GOSSIP, RESET
+        LOCAL, REMOTE, GOSSIP, RESET, OFFLINE_TOOL
     }
 }
\ No newline at end of file
diff --git a/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java b/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java
index be974c1247..4e36cf1066 100644
--- a/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java
+++ b/src/java/org/apache/cassandra/tcm/PaxosBackedProcessor.java
@@ -66,7 +66,7 @@ public class PaxosBackedProcessor extends AbstractLocalProcessor
     @Override
     protected boolean acceptCommit(ClusterMetadata metadata)
     {
-        return metadata.isCMSMember(FBUtilities.getBroadcastAddressAndPort());
+        return metadata.isCMSMember();
     }
 
     @Override
diff --git a/src/java/org/apache/cassandra/tcm/Startup.java b/src/java/org/apache/cassandra/tcm/Startup.java
index 8f55c8fa75..f9a4313afa 100644
--- a/src/java/org/apache/cassandra/tcm/Startup.java
+++ b/src/java/org/apache/cassandra/tcm/Startup.java
@@ -402,7 +402,7 @@ import static org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort;
                                                           DatabaseDescriptor.getPartitioner().getClass().getCanonicalName(),
                                                           metadata.partitioner.getClass().getCanonicalName()));
 
-        if (!metadata.isCMSMember(FBUtilities.getBroadcastAddressAndPort()))
+        if (!metadata.isCMSMember())
             throw new IllegalStateException("When reinitializing with cluster metadata, we must be in the CMS");
 
         metadata = metadata.forceEpoch(metadata.epoch.nextEpoch());
diff --git a/src/java/org/apache/cassandra/tools/CMSOfflineTool.java b/src/java/org/apache/cassandra/tools/CMSOfflineTool.java
index 3b5e78c1ce..b2c87931e6 100644
--- a/src/java/org/apache/cassandra/tools/CMSOfflineTool.java
+++ b/src/java/org/apache/cassandra/tools/CMSOfflineTool.java
@@ -609,7 +609,7 @@ public class CMSOfflineTool implements Runnable
             output.out.printf("Cluster Metadata Service:%n");
             output.out.printf("Members: %s%n", members);
             output.out.printf("Needs reconfiguration: %s%n", needsReconfiguration(metadata));
-            output.out.printf("Service State: %s%n", ClusterMetadataService.state(metadata));
+            output.out.printf("Service State: %s%n", ClusterMetadataService.State.OFFLINE_TOOL);
             output.out.printf("Epoch: %s%n", metadata.epoch.getEpoch());
             output.out.printf("Replication factor: %s%n", ReplicationParams.meta(metadata).toString());
         }
diff --git a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/AssassinateCMSNodeTest.java b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/AssassinateCMSNodeTest.java
index e84b51ff80..f39c16ecd7 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/AssassinateCMSNodeTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/hostreplacement/AssassinateCMSNodeTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.distributed.test.TestBaseImpl;
 import org.apache.cassandra.tcm.ClusterMetadata;
-import org.apache.cassandra.utils.FBUtilities;
 
 import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
 import static org.apache.cassandra.distributed.api.Feature.NETWORK;
@@ -46,8 +45,8 @@ public class AssassinateCMSNodeTest extends TestBaseImpl
             InetSocketAddress toAssassinate = cluster.get(2).broadcastAddress();
             cluster.get(2).shutdown().get();
             cluster.get(1).nodetoolResult("assassinate", toAssassinate.getHostString()).asserts().success();
-            cluster.get(1).runOnInstance(() -> assertTrue(ClusterMetadata.current().isCMSMember(FBUtilities.getBroadcastAddressAndPort())));
-            cluster.get(3).runOnInstance(() -> assertTrue(ClusterMetadata.current().isCMSMember(FBUtilities.getBroadcastAddressAndPort())));
+            cluster.get(1).runOnInstance(() -> assertTrue(ClusterMetadata.current().isCMSMember()));
+            cluster.get(3).runOnInstance(() -> assertTrue(ClusterMetadata.current().isCMSMember()));
             cluster.get(1).nodetoolResult("cms").asserts().success();
         }
     }
diff --git a/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSTest.java b/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSTest.java
index e2951a2f84..3b99de22b3 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/log/ReconfigureCMSTest.java
@@ -216,7 +216,7 @@ public class ReconfigureCMSTest extends FuzzTestBase
             awaitRingJoin(replacingNode, cluster.get(1));
             replacingNode.runOnInstance(() -> {
                 ClusterMetadata metadata = ClusterMetadata.current();
-                assertTrue(metadata.isCMSMember(FBUtilities.getBroadcastAddressAndPort()));
+                assertTrue(metadata.isCMSMember());
                 assertEquals(3, metadata.fullCMSMembers().size());
             });
         }
diff --git a/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterReplacementTest.java b/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterReplacementTest.java
index 4a78f8805a..7722969a6a 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterReplacementTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/tcm/CMSPlacementAfterReplacementTest.java
@@ -34,7 +34,6 @@ import org.apache.cassandra.distributed.test.TestBaseImpl;
 import org.apache.cassandra.locator.InetAddressAndPort;
 import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.tcm.membership.NodeId;
-import org.apache.cassandra.utils.FBUtilities;
 
 import static org.apache.cassandra.distributed.shared.ClusterUtils.addInstance;
 import static org.apache.cassandra.distributed.shared.ClusterUtils.awaitRingJoin;
@@ -80,7 +79,7 @@ public class CMSPlacementAfterReplacementTest extends TestBaseImpl
         IInvokableInstance nodeToRemove = cluster.get(2);
         cluster.get(1).nodetoolResult("cms", "reconfigure", "3").asserts().success();
         cluster.get(2).runOnInstance(() -> {
-            assertTrue(ClusterMetadata.current().isCMSMember(FBUtilities.getBroadcastAddressAndPort()));
+            assertTrue(ClusterMetadata.current().isCMSMember());
         });
         nodeToRemove.shutdown().get();
         IInvokableInstance replacingNode = addInstance(cluster, nodeToRemove.config(),
diff --git a/test/unit/org/apache/cassandra/tools/CMSOfflineToolTest.java b/test/unit/org/apache/cassandra/tools/CMSOfflineToolTest.java
index 2461eab603..04209514bb 100644
--- a/test/unit/org/apache/cassandra/tools/CMSOfflineToolTest.java
+++ b/test/unit/org/apache/cassandra/tools/CMSOfflineToolTest.java
@@ -670,7 +670,7 @@ public class CMSOfflineToolTest extends OfflineToolUtils
         "Cluster Metadata Service:\n" +
         "Members: /127.0.0.1:" + storagePort + ",/127.0.0.2:" + storagePort + ",/127.0.0.3:" + storagePort + '\n' +
         "Needs reconfiguration: false\n" +
-        "Service State: LOCAL\n" +
+        "Service State: " + ClusterMetadataService.State.OFFLINE_TOOL + '\n' +
         "Epoch: 2\n" +
         "Replication factor: ReplicationParams{class=org.apache.cassandra.locator.MetaStrategy, datacenter1=3}\n";
         assertThat(result.getStdout()).isEqualTo(expectedOutput);