diff --git a/src/app/participant-room/participant-room.component.html b/src/app/participant-room/participant-room.component.html
index c5cfec5390c168b6528c784f62ae5087502281a1..250352b278958dc693284df5094455d51b06cc88 100644
--- a/src/app/participant-room/participant-room.component.html
+++ b/src/app/participant-room/participant-room.component.html
@@ -1,6 +1,7 @@
 <div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
   <div fxLayout="row" fxLayoutAlign="center">
-    <mat-card>
+    <mat-progress-spinner *ngIf="isLoading" mode="indeterminate"></mat-progress-spinner>
+    <mat-card *ngIf="room">
       <mat-card-header>
         <mat-card-title><h3 class="subheading-2">{{ room.name }}</h3></mat-card-title>
         <mat-card-subtitle>{{ room.shortId }}</mat-card-subtitle>
@@ -13,7 +14,7 @@
       </mat-card-content>
       <mat-divider></mat-divider>
       <mat-card-actions>
-        <button mat-icon-button color="primary" matTooltip="Ask something" routerLink="/room/{{roomId}}/create-comment">
+        <button mat-icon-button color="primary" matTooltip="Ask something" routerLink="room/{{room.id}}/create-comment">
           <mat-icon>question_answer</mat-icon>
         </button>
         <button mat-icon-button color="primary" matTooltip="Give feedback">
@@ -30,6 +31,9 @@
         </button>
       </mat-card-actions>
     </mat-card>
+    <div *ngIf="!isLoading && !room">
+       Error: room could not be found!
+    </div>
   </div>
   <button mat-button color="primary" (click)="goBack()">Back</button>
 </div>
diff --git a/src/app/participant-room/participant-room.component.ts b/src/app/participant-room/participant-room.component.ts
index 5d3edd75ea21011384a70649da2ba6d3af835dae..f78016239d294600d191cfecd70184dbbb780c1a 100644
--- a/src/app/participant-room/participant-room.component.ts
+++ b/src/app/participant-room/participant-room.component.ts
@@ -12,6 +12,7 @@ import { ActivatedRoute } from '@angular/router';
 export class ParticipantRoomComponent implements OnInit {
 
   room: Room;
+  isLoading = true;
 
   constructor(private location: Location,
               private roomService: RoomService,
@@ -26,7 +27,10 @@ export class ParticipantRoomComponent implements OnInit {
 
   getRoom(id: string): void {
     this.roomService.getRoom(id)
-      .subscribe(room => this.room = room);
+      .subscribe(room => {
+        this.room = room;
+        this.isLoading = false;
+      });
   }