diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
index 08de06650cc2ebd384e92c7b19f1171a42cef729..a940d40b1814aa7d4f837adf297f04b5cdab74ec 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
@@ -5,14 +5,14 @@
     <mat-form-field class="input-block">
       <input [(ngModel)]="editRoom.name" matInput placeholder="{{ 'session.session-name' | translate}}"
              name="room-name" maxlength="20"/>
-      <mat-hint align="end">{{editRoom.name.length }} / 20</mat-hint>
+      <mat-hint align="end">{{ editRoom.name.length }} / 20</mat-hint>
     </mat-form-field>
     <mat-form-field class="input-block">
               <textarea [(ngModel)]="editRoom.description" matInput matTextareaAutosize
                         matAutosizeMinRows="2" matAutosizeMaxRows="5" maxlength="255"
                         placeholder="{{ 'session.description' | translate}}" name="description">
               </textarea>
-      <mat-hint align="end">{{editRoom.description.length }} / 255</mat-hint>
+      <mat-hint align="end">{{ editRoom.description ? editRoom.description.length : 0 }} / 255</mat-hint>
     </mat-form-field>
     <div fxLayoutAlign="center center">
       <button mat-raised-button class="delete" (click)="openDeleteRoomDialog()">
diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss
index 2dd1385d892fceeadbbfa1b769c13a1d21d9834b..ef90a45d14ff8ec4cd69719618bab6a677c31073 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss
@@ -3,7 +3,7 @@
 }
 
 .delete {
-  margin-bottom: 20px;
+  margin: 20px 0 20px 0;
   min-width: 220px;
   background-color: var(--red);
   color: var(--on-secondary);