diff --git a/ts/components/session/registration/RegistrationTabs.tsx b/ts/components/session/registration/RegistrationTabs.tsx
index d3128df43..9c94ec543 100644
--- a/ts/components/session/registration/RegistrationTabs.tsx
+++ b/ts/components/session/registration/RegistrationTabs.tsx
@@ -17,7 +17,7 @@ import {
 import { fromHex } from '../../../session/utils/String';
 import { TaskTimedOutError } from '../../../session/utils/Promise';
 import { mn_decode } from '../../../session/crypto/mnemonic';
-import { SwarmPolling } from '../../../session/snode_api/swarmPolling';
+import { getSwarmPollingInstance } from '../../../session/snode_api/swarmPolling';
 
 export const MAX_USERNAME_LENGTH = 20;
 // tslint:disable: use-simple-attributes
@@ -191,11 +191,9 @@ export async function signInWithLinking(signInDetails: {
   try {
     await resetRegistration();
     await window.setPassword(password);
-    const pubkeyStr = await signInByLinkingDevice(userRecoveryPhrase, 'english');
-
+    await signInByLinkingDevice(userRecoveryPhrase, 'english');
     let displayNameFromNetwork = '';
-    SwarmPolling.getInstance().addPubkey(pubkeyStr);
-    SwarmPolling.getInstance().start();
+    await getSwarmPollingInstance().start();
 
     await PromiseUtils.waitForTask(done => {
       window.Whisper.events.on('configurationMessageReceived', (displayName: string) => {