diff --git a/types/query/filtered_pagination.go b/types/query/filtered_pagination.go
index 2856d513f2..47dd31aaba 100644
--- a/types/query/filtered_pagination.go
+++ b/types/query/filtered_pagination.go
@@ -98,7 +98,9 @@ func FilteredPaginate(
 		}
 
 		if numHits == end+1 {
-			nextKey = iterator.Key()
+			if nextKey == nil {
+				nextKey = iterator.Key()
+			}
 
 			if !countTotal {
 				break
diff --git a/types/query/filtered_pagination_test.go b/types/query/filtered_pagination_test.go
index 49bfe34860..694d0c3cbb 100644
--- a/types/query/filtered_pagination_test.go
+++ b/types/query/filtered_pagination_test.go
@@ -253,3 +253,66 @@ func execFilterPaginate(store sdk.KVStore, pageReq *query.PageRequest, appCodec
 
 	return balResult, res, err
 }
+
+func (s *paginationTestSuite) TestFilteredPaginationsNextKey() {
+	app, ctx, appCodec := setupTest(s.T())
+
+	var balances sdk.Coins
+
+	for i := 1; i <= 10; i++ {
+		denom := fmt.Sprintf("test%ddenom", i)
+		balances = append(balances, sdk.NewInt64Coin(denom, int64(i)))
+	}
+
+	balances = balances.Sort()
+	addr1 := sdk.AccAddress([]byte("addr1"))
+	acc1 := app.AccountKeeper.NewAccountWithAddress(ctx, addr1)
+	app.AccountKeeper.SetAccount(ctx, acc1)
+	s.Require().NoError(testutil.FundAccount(app.BankKeeper, ctx, addr1, balances))
+	store := ctx.KVStore(app.GetKey(types.StoreKey))
+
+	execFilterPaginate := func(store sdk.KVStore, pageReq *query.PageRequest, appCodec codec.Codec) (balances sdk.Coins, res *query.PageResponse, err error) {
+		balancesStore := prefix.NewStore(store, types.BalancesPrefix)
+		accountStore := prefix.NewStore(balancesStore, address.MustLengthPrefix(addr1))
+
+		var balResult sdk.Coins
+		res, err = query.FilteredPaginate(accountStore, pageReq, func(key []byte, value []byte, accumulate bool) (bool, error) {
+			var amount sdk.Int
+			err := amount.Unmarshal(value)
+			if err != nil {
+				return false, err
+			}
+
+			// filter odd amounts
+			if amount.Int64()%2 == 1 {
+				if accumulate {
+					balResult = append(balResult, sdk.NewCoin(string(key), amount))
+				}
+
+				return true, nil
+			}
+
+			return false, nil
+		})
+
+		return balResult, res, err
+	}
+
+	s.T().Log("verify next key of offset query")
+	pageReq := &query.PageRequest{Key: nil, Limit: 1, CountTotal: true}
+	balances, res, err := execFilterPaginate(store, pageReq, appCodec)
+	s.Require().NoError(err)
+	s.Require().NotNil(res)
+	s.Require().Equal(1, len(balances))
+	s.Require().Equal(balances[0].Amount.Int64(), int64(1))
+	s.Require().Equal(uint64(5), res.Total)
+	s.Require().NotNil(res.NextKey)
+
+	pageReq = &query.PageRequest{Key: res.NextKey, Limit: 1}
+	balances, res, err = execFilterPaginate(store, pageReq, appCodec)
+	s.Require().NoError(err)
+	s.Require().NotNil(res)
+	s.Require().Equal(1, len(balances))
+	s.Require().Equal(balances[0].Amount.Int64(), int64(3))
+	s.Require().NotNil(res.NextKey)
+}