diff --git a/mutable_tree.go b/mutable_tree.go
index abb899edc..4d352f680 100644
--- a/mutable_tree.go
+++ b/mutable_tree.go
@@ -346,7 +346,9 @@ func (tree *MutableTree) remove(key []byte) (value []byte, orphaned []*Node, rem
 		return nil, nil, false, nil
 	}
 
-	tree.addUnsavedRemoval(key)
+	if !tree.skipFastStorageUpgrade {
+		tree.addUnsavedRemoval(key)
+	}
 
 	if newRoot == nil && newRootHash != nil {
 		tree.root, err = tree.ndb.GetNode(newRootHash)