diff --git a/src/cpp/ripple/ripple_SHAMapSync.cpp b/src/cpp/ripple/ripple_SHAMapSync.cpp
index 2c5621ce27..d09b33c0f0 100644
--- a/src/cpp/ripple/ripple_SHAMapSync.cpp
+++ b/src/cpp/ripple/ripple_SHAMapSync.cpp
@@ -77,7 +77,8 @@ void SHAMap::getMissingNodes (std::vector<SHAMapNode>& nodeIDs, std::vector<uint
         if (have_all)
         {
             node->setFullBelow ();
-            fullBelowCache.add (node->getNodeHash ());
+            if (mType == smtSTATE)
+                fullBelowCache.add (node->getNodeHash ());
         }
     }
 
@@ -143,7 +144,8 @@ std::vector<uint256> SHAMap::getNeededHashes (int max, SHAMapSyncFilter* filter)
         if (have_all)
         {
             node->setFullBelow ();
-            fullBelowCache.add (node->getNodeHash ());
+            if (mType == smtSTATE)
+                fullBelowCache.add (node->getNodeHash ());
         }
     }
 
diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.cpp b/src/cpp/ripple/ripple_SHAMapTreeNode.cpp
index 0a7d16dcf9..4f096071b4 100644
--- a/src/cpp/ripple/ripple_SHAMapTreeNode.cpp
+++ b/src/cpp/ripple/ripple_SHAMapTreeNode.cpp
@@ -19,7 +19,7 @@ SHAMapTreeNode::SHAMapTreeNode (const SHAMapTreeNode& node, uint32 seq) : SHAMap
 }
 
 SHAMapTreeNode::SHAMapTreeNode (const SHAMapNode& node, SHAMapItem::ref item, TNType type, uint32 seq) :
-    SHAMapNode (node), mItem (item), mSeq (seq), mType (type), mIsBranch (0), mFullBelow (true)
+    SHAMapNode (node), mItem (item), mSeq (seq), mType (type), mIsBranch (0), mFullBelow (false)
 {
     assert (item->peekData ().size () >= 12);
     updateHash ();