diff --git a/src/app/project-map/project-map.component.css b/src/app/project-map/project-map.component.css
index 54347c55..a6f8269e 100644
--- a/src/app/project-map/project-map.component.css
+++ b/src/app/project-map/project-map.component.css
@@ -30,5 +30,11 @@ g.node:hover {
 }
 
 .loading-spinner {
-  display: flex; justify-content: center; align-items: center;
+  position: absolute;
+  top: 50%;
+  width: 100px;
+  margin-left:-50px;
+  margin-top: -50px;
+  left: 50%;
 }
+
diff --git a/src/app/project-map/project-map.component.html b/src/app/project-map/project-map.component.html
index 6163b30d..e1a81216 100644
--- a/src/app/project-map/project-map.component.html
+++ b/src/app/project-map/project-map.component.html
@@ -46,7 +46,7 @@
   <app-node-select-interface (onChooseInterface)="onChooseInterface($event)"></app-node-select-interface>
 </div>
 
-<div class="loading-spinner">
+<div class="loading-spinner" *ngIf="isLoading">
   <mat-spinner color="primary">
   </mat-spinner>
 </div>
diff --git a/src/app/project-map/project-map.component.ts b/src/app/project-map/project-map.component.ts
index 9b52cbaf..26ab5246 100644
--- a/src/app/project-map/project-map.component.ts
+++ b/src/app/project-map/project-map.component.ts
@@ -52,7 +52,7 @@ export class ProjectMapComponent implements OnInit {
 
   private ws: Subject<any>;
   private drawLineMode =  false;
-  private isLoading = true;
+  public isLoading = true;
 
   @ViewChild(MapComponent) mapChild: MapComponent;
 
@@ -123,7 +123,7 @@ export class ProjectMapComponent implements OnInit {
 
         this.setUpMapCallbacks(project);
         this.setUpWS(project);
-        this.isLoading = true;
+        this.isLoading = false;
       });
 
 
diff --git a/src/styles.css b/src/styles.css
index e18b7107..5723d03e 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -8,3 +8,4 @@ img.logo-header {
 a.table-link {
   color: #0097a7;
 }
+