diff --git a/app/store.go b/app/store.go
index a9a8b4360cf8..9009653d6600 100644
--- a/app/store.go
+++ b/app/store.go
@@ -130,11 +130,16 @@ func (s *Store) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQuery)
 
 	height := reqQuery.Height
 	if height == 0 {
-		if tree.Tree.VersionExists(s.height - 1) {
-			height = s.height - 1
-		} else {
-			height = s.height
-		}
+		// TODO: once the rpc actually passes in non-zero
+		// heights we can use to query right after a tx
+		// we must retrun most recent, even if apphash
+		// is not yet in the blockchain
+
+		// if tree.Tree.VersionExists(s.height - 1) {
+		// 	height = s.height - 1
+		// } else {
+		height = s.height
+		// }
 	}
 	resQuery.Height = height