diff --git a/src/server/src/main/java/io/cassandrareaper/management/http/HttpCassandraManagementProxy.java b/src/server/src/main/java/io/cassandrareaper/management/http/HttpCassandraManagementProxy.java
index fe5b28860..0cf66e5b4 100644
--- a/src/server/src/main/java/io/cassandrareaper/management/http/HttpCassandraManagementProxy.java
+++ b/src/server/src/main/java/io/cassandrareaper/management/http/HttpCassandraManagementProxy.java
@@ -500,8 +500,11 @@ public Map<String, String> getTokenToEndpointMap() {
       Map<String, String> tokenMap = new HashMap<>();
       for (Map<String, String> states : epStates.getEntity()) {
         String ip = states.get("ENDPOINT_IP");
-        for (String token : states.get("TOKENS").split(",")) {
-          tokenMap.put(token, ip);
+        LOG.info("Endpoint IP: {} has tokens: {}", ip, states.get("TOKENS"));
+        if (!states.getOrDefault("TOKENS", "").equals("")) {
+          for (String token : states.get("TOKENS").split(",")) {
+            tokenMap.put(token, ip);
+          }
         }
       }
       return tokenMap;