diff --git a/store/CHANGELOG.md b/store/CHANGELOG.md
index 84b2a0d35eb3..6cf411505792 100644
--- a/store/CHANGELOG.md
+++ b/store/CHANGELOG.md
@@ -28,6 +28,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 
 * (store) [#20425](https://github.com/cosmos/cosmos-sdk/pull/20425) Fix nil pointer panic when query historical state where a new store don't exist.
+* (store) [#20644](https://github.com/cosmos/cosmos-sdk/pull/20644) Avoid nil error on not exhausted payload stream.
 
 ## v1.1.0 (March 20, 2024)
 
diff --git a/store/snapshots/manager.go b/store/snapshots/manager.go
index a6f82190c537..6c7816705b8c 100644
--- a/store/snapshots/manager.go
+++ b/store/snapshots/manager.go
@@ -390,7 +390,7 @@ func (m *Manager) doRestoreSnapshot(snapshot types.Snapshot, chChunks <-chan io.
 		}
 
 		if nextItem.GetExtensionPayload() != nil {
-			return errorsmod.Wrapf(err, "extension %s don't exhausted payload stream", metadata.Name)
+			return fmt.Errorf("extension %s don't exhausted payload stream", metadata.Name)
 		}
 	}
 	return nil
diff --git a/store/v2/snapshots/manager.go b/store/v2/snapshots/manager.go
index b4eca52d4b9c..75e6e4ad616c 100644
--- a/store/v2/snapshots/manager.go
+++ b/store/v2/snapshots/manager.go
@@ -438,7 +438,7 @@ func (m *Manager) doRestoreSnapshot(snapshot types.Snapshot, chChunks <-chan io.
 		}
 
 		if nextItem.GetExtensionPayload() != nil {
-			return errorsmod.Wrapf(err, "extension %s don't exhausted payload stream", metadata.Name)
+			return fmt.Errorf("extension %s don't exhausted payload stream", metadata.Name)
 		}
 	}