diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
index be53405a35..d7150e84e6 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -30,7 +30,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.lang.StringUtils;
 import org.jumpmind.db.sql.ISqlRowMapper;
@@ -127,7 +126,9 @@ public Set<Node> findNodesThatOriginatedFromNodeId(String originalNodeId, boolea
      * with it.
      */
     public Node findNode(String id) {
-        return findAllNodesAsMap().get(id);
+        List<Node> list = sqlTemplate.query(getSql("selectNodePrefixSql", "findNodeSql"),
+        new NodeRowMapper(), id);
+        return (Node) getFirstEntry(list);
     }
     
     public String getExternalId(String nodeId) {