diff --git a/frontend/src/app/components/blockchain/blockchain.component.html b/frontend/src/app/components/blockchain/blockchain.component.html
index dbe8971cf..1470243ce 100644
--- a/frontend/src/app/components/blockchain/blockchain.component.html
+++ b/frontend/src/app/components/blockchain/blockchain.component.html
@@ -1,18 +1,15 @@
 <div class="text-center" class="blockchain-wrapper">
-  <div class="position-container">
-
-    <span [hidden]="isLoading">
+  <div class="position-container" [hidden]="isLoading">
+    <span>
       <app-mempool-blocks></app-mempool-blocks>
       <app-blockchain-blocks></app-blockchain-blocks>
       <div id="divider"></div>
     </span>
-
-    <ng-template [ngIf]="isLoading">
-      <div class="loading-block">
-        <h3>Waiting for blocks...</h3>
-        <div class="spinner-border text-light mt-2"></div>
-      </div>
-    </ng-template>
-
   </div>
-</div>
\ No newline at end of file
+  <div *ngIf="isLoading" class="position-container loading">
+    <div class="loading-block">
+      <h3>Waiting for blocks...</h3>
+      <div class="spinner-border text-light mt-2"></div>
+    </div>
+  </div>
+</div>
diff --git a/frontend/src/app/components/blockchain/blockchain.component.scss b/frontend/src/app/components/blockchain/blockchain.component.scss
index 4db6a0b08..03528a341 100644
--- a/frontend/src/app/components/blockchain/blockchain.component.scss
+++ b/frontend/src/app/components/blockchain/blockchain.component.scss
@@ -28,7 +28,10 @@
 
 @media (max-width: 767.98px) {
   .position-container {
-    left: 97%;
+    left: 95%;
+  }
+  .position-container.loading {
+    left: 50%;
   }
 }
 
diff --git a/frontend/src/app/components/fees-box/fees-box.component.html b/frontend/src/app/components/fees-box/fees-box.component.html
index d2f9e0ba9..f70fdf091 100644
--- a/frontend/src/app/components/fees-box/fees-box.component.html
+++ b/frontend/src/app/components/fees-box/fees-box.component.html
@@ -4,7 +4,7 @@
     <td class="border-top-0">30 minutes</td>
     <td class="border-top-0">Next block</td>
   </tr>
-  <tr *ngIf="(feeEstimations$ | async) as feeEstimations; else loadingFees">
+  <tr *ngIf="(isLoadingWebSocket$ | async) === false && (feeEstimations$ | async) as feeEstimations; else loadingFees">
     <td class="d-none d-md-table-cell">{{ feeEstimations.hourFee }} sat/vB (<app-fiat [value]="feeEstimations.hourFee * 250"></app-fiat>)</td>
     <td>{{ feeEstimations.halfHourFee }} sat/vB (<app-fiat [value]="feeEstimations.halfHourFee * 250"></app-fiat>)</td>
     <td>{{ feeEstimations.fastestFee }} sat/vB (<app-fiat [value]="feeEstimations.fastestFee * 250"></app-fiat>)</td>
diff --git a/frontend/src/app/components/fees-box/fees-box.component.ts b/frontend/src/app/components/fees-box/fees-box.component.ts
index c55c164a8..a4e351c3b 100644
--- a/frontend/src/app/components/fees-box/fees-box.component.ts
+++ b/frontend/src/app/components/fees-box/fees-box.component.ts
@@ -17,12 +17,14 @@ interface FeeEstimations {
 })
 export class FeesBoxComponent implements OnInit {
   feeEstimations$: Observable<FeeEstimations>;
+  isLoadingWebSocket$: Observable<boolean>;
 
   constructor(
     private stateService: StateService,
   ) { }
 
   ngOnInit(): void {
+    this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$;
     this.feeEstimations$ = this.stateService.mempoolBlocks$
       .pipe(
         filter((blocks) => !!blocks.length),