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 0d80da2664..8a540cedb1 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
@@ -146,7 +146,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 Node findNode(String id, boolean useCache) {