diff --git a/packages/neuron-wallet/src/services/indexer.ts b/packages/neuron-wallet/src/services/indexer.ts
index 4da269da95..954cf741df 100644
--- a/packages/neuron-wallet/src/services/indexer.ts
+++ b/packages/neuron-wallet/src/services/indexer.ts
@@ -168,10 +168,12 @@ export default class IndexerService {
     }
 
 
-    // REFACTOR: use message to return the promise
-    while (!(await IndexerService.isPortReachable(+IndexerService.PORT))) {
-      await CommonUtils.sleep(1000)
-    }
+    await CommonUtils.retry(5, 1000, async () => {
+      const portReachable = await IndexerService.isPortReachable(+IndexerService.PORT)
+      if (!portReachable) {
+        throw new Error('Port is not reachable')
+      }
+    })
   }
 
   clearData = () => {