diff --git a/ts/session/snode_api/serviceNodeAPI.ts b/ts/session/snode_api/serviceNodeAPI.ts
index 0cb783058..c7f20c261 100644
--- a/ts/session/snode_api/serviceNodeAPI.ts
+++ b/ts/session/snode_api/serviceNodeAPI.ts
@@ -347,7 +347,7 @@ export async function storeOnNode(
 export async function retrieveNextMessages(
   nodeData: Snode,
   lastHash: string,
-  pubkey: PubKey
+  pubkey: string
 ): Promise<Array<any>> {
   const params = {
     pubKey: pubkey,
diff --git a/ts/session/snode_api/swarmPolling.ts b/ts/session/snode_api/swarmPolling.ts
index ed2b98d5c..2b4eddd42 100644
--- a/ts/session/snode_api/swarmPolling.ts
+++ b/ts/session/snode_api/swarmPolling.ts
@@ -119,11 +119,11 @@ export class SwarmPolling {
   ): Promise<Array<any>> {
     const edkey = node.pubkey_ed25519;
 
-    const pkStr = pubkey.key ? pubkey.key : pubkey;
+    const pkStr = (pubkey.key ? pubkey.key : pubkey) as string;
 
-    const prevHash = await this.getLastHash(edkey, pkStr as string);
+    const prevHash = await this.getLastHash(edkey, pkStr);
 
-    const messages = await retrieveNextMessages(node, prevHash, pubkey);
+    const messages = await retrieveNextMessages(node, prevHash, pkStr);
 
     if (!messages.length) {
       return [];