diff --git a/backend/src/index.ts b/backend/src/index.ts
index fa80fb2ad..0f7cc7aa7 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -28,7 +28,7 @@ import nodesRoutes from './api/explorer/nodes.routes';
 import channelsRoutes from './api/explorer/channels.routes';
 import generalLightningRoutes from './api/explorer/general.routes';
 import lightningStatsUpdater from './tasks/lightning/stats-updater.service';
-import nodeSyncService from './tasks/lightning/node-sync.service';
+import networkSyncService from './tasks/lightning/network-sync.service';
 import statisticsRoutes from './api/statistics/statistics.routes';
 import miningRoutes from './api/mining/mining-routes';
 import bisqRoutes from './api/bisq/bisq.routes';
@@ -136,8 +136,8 @@ class Server {
     }
 
     if (config.LIGHTNING.ENABLED) {
-      nodeSyncService.$startService()
-        .then(() => lightningStatsUpdater.$startService());
+      networkSyncService.$startService()
+      .then(() => lightningStatsUpdater.$startService());
     }
 
     this.server.listen(config.MEMPOOL.HTTP_PORT, () => {
diff --git a/backend/src/tasks/lightning/node-sync.service.ts b/backend/src/tasks/lightning/network-sync.service.ts
similarity index 97%
rename from backend/src/tasks/lightning/node-sync.service.ts
rename to backend/src/tasks/lightning/network-sync.service.ts
index 863ee30da..826664cf4 100644
--- a/backend/src/tasks/lightning/node-sync.service.ts
+++ b/backend/src/tasks/lightning/network-sync.service.ts
@@ -10,7 +10,7 @@ import { $lookupNodeLocation } from './sync-tasks/node-locations';
 import lightningApi from '../../api/lightning/lightning-api-factory';
 import { convertChannelId } from '../../api/lightning/clightning/clightning-convert';
 
-class NodeSyncService {
+class NetworkSyncService {
   constructor() {}
 
   public async $startService() {
@@ -28,6 +28,11 @@ class NodeSyncService {
       logger.info(`Updating nodes and channels...`);
 
       const networkGraph = await lightningApi.$getNetworkGraph();
+      if (networkGraph.nodes.length === 0 || networkGraph.edges.length === 0) {
+        logger.info(`LN Network graph is empty, retrying in 10 seconds`);
+        setTimeout(this.$runUpdater, 10000);
+        return;
+      }
 
       for (const node of networkGraph.nodes) {
         await this.$saveNode(node);
@@ -376,6 +381,10 @@ class NodeSyncService {
   }
 
   private async $setChannelsInactive(graphChannelsIds: string[]): Promise<void> {
+    if (graphChannelsIds.length === 0) {
+      return;
+    }
+
     try {
       await DB.query(`
         UPDATE channels
@@ -447,4 +456,4 @@ class NodeSyncService {
   }
 }
 
-export default new NodeSyncService();
+export default new NetworkSyncService();