diff --git a/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/PlayerHistory.tsx b/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/PlayerHistory.tsx
index 6ef7563..3a3610e 100644
--- a/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/PlayerHistory.tsx
+++ b/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/PlayerHistory.tsx
@@ -40,10 +40,10 @@ function PlayerHistory({ t, server, playerID }: Props) {
   >(PLAYER_HISTORY_AND_DAILY_STATS, {
     fetchPolicy: 'cache-and-network',
     variables: {
-      limit,
-      playerHistoryOffset: query.page * limit,
-      dailyPlayerStatsOffset: query.page * limit + 1,
+      offset: query.page * limit,
       sort: ['createDate DESC'],
+      playerHistoryLimit: limit,
+      dailyPlayerStatsLimit: limit + 1,
       playerHistoryFilter: {
         playerID: [playerID],
       },
diff --git a/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/queries.ts b/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/queries.ts
index a624039..993e801 100644
--- a/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/queries.ts
+++ b/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/queries.ts
@@ -6,16 +6,16 @@ export const PLAYER_HISTORY_AND_DAILY_STATS = gql`
     $playerHistoryFilter: PlayerHistoryFilter
     $dailyPlayerStatsFilter: DailyPlayerStatsFilter
     $sort: [String!]
-    $limit: Int
-    $playerHistoryOffset: Int
-    $dailyPlayerStatsOffset: Int
+    $offset: Int
+    $playerHistoryLimit: Int
+    $dailyPlayerStatsLimit: Int
   ) {
     playerHistory(
       server: $server
       filter: $playerHistoryFilter
       sort: $sort
-      limit: $limit
-      offset: $playerHistoryOffset
+      limit: $playerHistoryLimit
+      offset: $offset
     ) {
       items {
         tribe {
@@ -41,8 +41,8 @@ export const PLAYER_HISTORY_AND_DAILY_STATS = gql`
       server: $server
       filter: $dailyPlayerStatsFilter
       sort: $sort
-      limit: $limit
-      offset: $dailyPlayerStatsOffset
+      limit: $dailyPlayerStatsLimit
+      offset: $offset
     ) {
       items {
         points
diff --git a/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/types.ts b/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/types.ts
index de73d2c..98dcd22 100644
--- a/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/types.ts
+++ b/src/features/ServerPage/features/PlayerPage/features/HistoryPage/components/PlayerHistory/types.ts
@@ -43,8 +43,8 @@ export type Variables = {
   server: string;
   playerHistoryFilter?: PlayerHistoryFilter;
   dailyPlayerStatsFilter?: DailyPlayerStatsFilter;
-  limit?: number;
+  offset?: number;
   sort?: string[];
-  playerHistoryOffset?: number;
-  dailyPlayerStatsOffset?: number;
+  playerHistoryLimit?: number;
+  dailyPlayerStatsLimit?: number;
 };
diff --git a/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/TribeHistory.tsx b/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/TribeHistory.tsx
index 379b62b..c3cb339 100644
--- a/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/TribeHistory.tsx
+++ b/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/TribeHistory.tsx
@@ -38,9 +38,9 @@ function TribeHistory({ t, server, tribeID }: Props) {
   >(TRIBE_HISTORY_AND_DAILY_STATS, {
     fetchPolicy: 'cache-and-network',
     variables: {
-      limit,
-      tribeHistoryOffset: query.page * limit,
-      dailyTribeStatsOffset: query.page * limit + 1,
+      offset: query.page * query.limit,
+      tribeHistoryLimit: limit,
+      dailyTribeStatsLimit: limit + 1,
       sort: ['createDate DESC'],
       tribeHistoryFilter: {
         tribeID: [tribeID],
diff --git a/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/queries.ts b/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/queries.ts
index d5f2078..81be804 100644
--- a/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/queries.ts
+++ b/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/queries.ts
@@ -6,16 +6,16 @@ export const TRIBE_HISTORY_AND_DAILY_STATS = gql`
     $tribeHistoryFilter: TribeHistoryFilter
     $dailyTribeStatsFilter: DailyTribeStatsFilter
     $sort: [String!]
-    $limit: Int
-    $tribeHistoryOffset: Int
-    $dailyTribeStatsOffset: Int
+    $offset: Int
+    $tribeHistoryLimit: Int
+    $dailyTribeStatsLimit: Int
   ) {
     tribeHistory(
       server: $server
       filter: $tribeHistoryFilter
       sort: $sort
-      limit: $limit
-      offset: $tribeHistoryOffset
+      offset: $offset
+      limit: $tribeHistoryLimit
     ) {
       items {
         tribe {
@@ -40,8 +40,8 @@ export const TRIBE_HISTORY_AND_DAILY_STATS = gql`
       server: $server
       filter: $dailyTribeStatsFilter
       sort: $sort
-      limit: $limit
-      offset: $dailyTribeStatsOffset
+      offset: $offset
+      limit: $dailyTribeStatsLimit
     ) {
       items {
         points
diff --git a/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/types.ts b/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/types.ts
index 5dcb4e6..b6407c7 100644
--- a/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/types.ts
+++ b/src/features/ServerPage/features/TribePage/features/HistoryPage/components/TribeHistory/types.ts
@@ -37,8 +37,8 @@ export type Variables = {
   server: string;
   tribeHistoryFilter?: TribeHistoryFilter;
   dailyTribeStatsFilter?: DailyTribeStatsFilter;
-  limit?: number;
+  offset?: number;
   sort?: string[];
-  tribeHistoryOffset?: number;
-  dailyTribeStatsOffset?: number;
+  tribeHistoryLimit?: number;
+  dailyTribeStatsLimit?: number;
 };