diff --git a/store/rootmultistore.go b/store/rootmultistore.go
index b841abb904fb..783a5da47bcc 100644
--- a/store/rootmultistore.go
+++ b/store/rootmultistore.go
@@ -301,6 +301,14 @@ func (rs *rootMultiStore) Query(req abci.RequestQuery) abci.ResponseQuery {
 		return res
 	}
 
+	if len(res.Proof) == 0 {
+		if len(res.Value) == 0 {
+			return res
+		}
+		msg := fmt.Sprintf("proof from store %s is nil", storeName)
+		return sdk.ErrUnknownRequest(msg).QueryResult()
+	}
+
 	commitInfo, errMsg := getCommitInfo(rs.db, res.Height)
 	if errMsg != nil {
 		return sdk.ErrInternal(errMsg.Error()).QueryResult()