diff --git a/backend/src/tasks/lightning/network-sync.service.ts b/backend/src/tasks/lightning/network-sync.service.ts
index b87c63031..1fdd77361 100644
--- a/backend/src/tasks/lightning/network-sync.service.ts
+++ b/backend/src/tasks/lightning/network-sync.service.ts
@@ -107,8 +107,6 @@ class NetworkSyncService {
     } catch (e) {
       logger.err(`Cannot update channel list. Reason: ${(e instanceof Error ? e.message : e)}`);
     }
-
-    setTimeout(() => { this.$runTasks(); }, 1000 * config.LIGHTNING.STATS_REFRESH_INTERVAL);
   }
 
   // This method look up the creation date of the earliest channel of the node
diff --git a/backend/src/tasks/lightning/stats-updater.service.ts b/backend/src/tasks/lightning/stats-updater.service.ts
index ecb056859..9e6e5bd82 100644
--- a/backend/src/tasks/lightning/stats-updater.service.ts
+++ b/backend/src/tasks/lightning/stats-updater.service.ts
@@ -25,7 +25,7 @@ class LightningStatsUpdater {
     const date = new Date();
     Common.setDateMidnight(date);
     const networkGraph = await lightningApi.$getNetworkGraph();
-    LightningStatsImporter.computeNetworkStats(date.getTime() / 1000, networkGraph);
+    await LightningStatsImporter.computeNetworkStats(date.getTime() / 1000, networkGraph);
     
     logger.info(`Updated latest network stats`);
   }
diff --git a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts
index 0f10a106d..52da15125 100644
--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
 import { Observable } from 'rxjs';
 import { LanguageService } from 'src/app/services/language.service';
+import { EnterpriseService } from 'src/app/services/enterprise.service';
 
 @Component({
   selector: 'app-bisq-master-page',
@@ -18,6 +19,7 @@ export class BisqMasterPageComponent implements OnInit {
   constructor(
     private stateService: StateService,
     private languageService: LanguageService,
+    private enterpriseService: EnterpriseService,
   ) { }
 
   ngOnInit() {
diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.ts b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.ts
index 65f07320d..22a351068 100644
--- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.ts
+++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
 import { merge, Observable, of} from 'rxjs';
 import { LanguageService } from 'src/app/services/language.service';
+import { EnterpriseService } from 'src/app/services/enterprise.service';
 
 @Component({
   selector: 'app-liquid-master-page',
@@ -20,6 +21,7 @@ export class LiquidMasterPageComponent implements OnInit {
   constructor(
     private stateService: StateService,
     private languageService: LanguageService,
+    private enterpriseService: EnterpriseService,
   ) { }
 
   ngOnInit() {
diff --git a/frontend/src/app/services/enterprise.service.ts b/frontend/src/app/services/enterprise.service.ts
index 41a6194a1..bc80f337d 100644
--- a/frontend/src/app/services/enterprise.service.ts
+++ b/frontend/src/app/services/enterprise.service.ts
@@ -24,16 +24,16 @@ export class EnterpriseService {
       this.subdomain = subdomain;
       this.fetchSubdomainInfo();
       this.disableSubnetworks();
-    } else if (document.location.hostname === 'mempool.space') {
+    } else {
       this.insertMatomo();
     }
   }
 
-  getSubdomain() {
+  getSubdomain(): string {
     return this.subdomain;
   }
 
-  disableSubnetworks() {
+  disableSubnetworks(): void {
     this.stateService.env.TESTNET_ENABLED = false;
     this.stateService.env.LIQUID_ENABLED = false;
     this.stateService.env.LIQUID_TESTNET_ENABLED = false;
@@ -41,7 +41,7 @@ export class EnterpriseService {
     this.stateService.env.BISQ_ENABLED = false;
   }
 
-  fetchSubdomainInfo() {
+  fetchSubdomainInfo(): void {
     this.apiService.getEnterpriseInfo$(this.subdomain).subscribe((info) => {
       this.info = info;
       this.insertMatomo(info.site_id);
@@ -54,14 +54,38 @@ export class EnterpriseService {
     });
   }
 
-  insertMatomo(siteId = 5) {
+  insertMatomo(siteId?: number): void {
     let statsUrl = '//stats.mempool.space/';
-    if (this.document.location.hostname === 'liquid.network') {
-      statsUrl = '//stats.liquid.network/';
-      siteId = 8;
-    } else if (this.document.location.hostname === 'bisq.markets') {
-      statsUrl = '//stats.bisq.markets/';
-      siteId = 7;
+  
+    if (!siteId) {
+      switch (this.document.location.hostname) {
+        case 'mempool.space':
+          statsUrl = '//stats.mempool.space/';
+          siteId = 5;
+          break;
+        case 'mempool.ninja':
+          statsUrl = '//stats.mempool.space/';
+          siteId = 4;
+          break;
+        case 'liquid.network':
+          siteId = 8;
+          statsUrl = '//stats.liquid.network/';
+          break;
+        case 'liquid.place':
+          siteId = 10;
+          statsUrl = '//stats.liquid.network/';
+          break;
+        case 'bisq.markets':
+          siteId = 7;
+          statsUrl = '//stats.bisq.markets/';
+          break;
+        case 'bisq.ninja':
+          statsUrl = '//stats.bisq.markets/';
+          siteId = 11;
+          break;
+        default:
+          return;
+      }
     }
 
     // @ts-ignore