diff --git a/backend/src/graphql/resolvers/BalanceResolver.ts b/backend/src/graphql/resolvers/BalanceResolver.ts
index c42d3d101..34aedac37 100644
--- a/backend/src/graphql/resolvers/BalanceResolver.ts
+++ b/backend/src/graphql/resolvers/BalanceResolver.ts
@@ -5,8 +5,8 @@ import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import CONFIG from '../../config'
 import { Balance } from '../models/Balance'
 import { apiGet } from '../../apis/HttpRequest'
-import { User as tUser } from '../../typeorm/entity/User'
-import { Balance as tBalance } from '../../typeorm/entity/Balance'
+import { User as dbUser } from '../../typeorm/entity/User'
+import { Balance as dbBalance } from '../../typeorm/entity/Balance'
 import calculateDecay from '../../util/decay'
 import { roundFloorFrom4 } from '../../util/round'
 
@@ -20,8 +20,8 @@ export class BalanceResolver {
     if (!result.success) throw new Error(result.data)
 
     // load user and balance
-    const userEntity = await tUser.findByPubkeyHex(result.data.user.public_hex)
-    const balanceEntity = await tBalance.findByUser(userEntity.id)
+    const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex)
+    const balanceEntity = await dbBalance.findByUser(userEntity.id)
     const now = new Date()
     const balance = new Balance({
       balance: roundFloorFrom4(balanceEntity.amount),
diff --git a/backend/src/graphql/resolvers/GdtResolver.ts b/backend/src/graphql/resolvers/GdtResolver.ts
index 18365e9f9..4396c5ac9 100644
--- a/backend/src/graphql/resolvers/GdtResolver.ts
+++ b/backend/src/graphql/resolvers/GdtResolver.ts
@@ -6,6 +6,7 @@ import CONFIG from '../../config'
 import { GdtEntryList } from '../models/GdtEntryList'
 import { GdtTransactionSessionIdInput } from '../inputs/GdtInputs'
 import { apiGet } from '../../apis/HttpRequest'
+import { User as dbUser } from '../../typeorm/entity/User'
 
 @Resolver()
 export class GdtResolver {
@@ -17,13 +18,20 @@ export class GdtResolver {
     { currentPage = 1, pageSize = 5, order = 'DESC' }: GdtTransactionSessionIdInput,
     @Ctx() context: any,
   ): Promise<GdtEntryList> {
-    const result = await apiGet(
-      `${CONFIG.COMMUNITY_API_URL}listGDTTransactions/${currentPage}/${pageSize}/${order}/${context.sessionId}`,
+    // get public key for current logged in user
+    const result = await apiGet(CONFIG.LOGIN_API_URL + 'login?session_id=' + context.sessionId)
+    if (!result.success) throw new Error(result.data)
+
+    // load user
+    const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex)
+
+    const resultGDT = await apiGet(
+      `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.email}/${currentPage}/${pageSize}/${order}`,
     )
-    if (!result.success) {
+    if (!resultGDT.success) {
       throw new Error(result.data)
     }
 
-    return new GdtEntryList(result.data)
+    return new GdtEntryList(resultGDT.data)
   }
 }