diff --git a/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java b/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
index 560a67b8f3df..bf405d7690d3 100644
--- a/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
+++ b/core/trino-main/src/main/java/io/trino/metadata/DiscoveryNodeManager.java
@@ -285,13 +285,9 @@ private NodeState getNodeState(InternalNode node)
             if (isNodeShuttingDown(node.getNodeIdentifier())) {
                 return SHUTTING_DOWN;
             }
-            else {
-                return ACTIVE;
-            }
-        }
-        else {
-            return INACTIVE;
+            return ACTIVE;
         }
+        return INACTIVE;
     }
 
     private boolean isNodeShuttingDown(String nodeId)
@@ -348,7 +344,7 @@ public synchronized Set<InternalNode> getActiveConnectorNodes(CatalogName catalo
     }
 
     @Override
-    public NodesSnapshot getActiveNodesSnapshot()
+    public synchronized NodesSnapshot getActiveNodesSnapshot()
     {
         return new NodesSnapshot(allNodes.getActiveNodes(), activeNodesByCatalogName);
     }