diff --git a/src/app/pages/jitsi/jitsi.component.html b/src/app/pages/jitsi/jitsi.component.html
index 100506a..b83f42d 100644
--- a/src/app/pages/jitsi/jitsi.component.html
+++ b/src/app/pages/jitsi/jitsi.component.html
@@ -62,16 +62,6 @@
           </mat-error>
         </mat-form-field>
 
-        <mat-form-field>
-          <input matInput [ngxMatDatetimePicker]="expiresPicker" [(ngModel)]="jitsiRoom.expires"
-            formControlName="expires" placeholder="{{'jitsi.rooms.expires' | i18n}}" required>
-          <mat-datepicker-toggle matSuffix [for]="expiresPicker"></mat-datepicker-toggle>
-          <ngx-mat-datetime-picker #expiresPicker></ngx-mat-datetime-picker>
-          <mat-error>
-            {{'jitsi.rooms.error.expires' | i18n}}
-          </mat-error>
-        </mat-form-field>
-
         <mat-form-field>
           <input matInput [ngxMatDatetimePicker]="startsPicker" [(ngModel)]="jitsiRoom.starts" formControlName="starts"
             placeholder="{{'jitsi.rooms.starts' | i18n}}">
@@ -82,6 +72,16 @@
           </mat-error>
         </mat-form-field>
 
+        <mat-form-field>
+          <input matInput [ngxMatDatetimePicker]="expiresPicker" [(ngModel)]="jitsiRoom.expires"
+            formControlName="expires" placeholder="{{'jitsi.rooms.expires' | i18n}}">
+          <mat-datepicker-toggle matSuffix [for]="expiresPicker"></mat-datepicker-toggle>
+          <ngx-mat-datetime-picker #expiresPicker></ngx-mat-datetime-picker>
+          <mat-error>
+            {{'jitsi.rooms.error.expires' | i18n}}
+          </mat-error>
+        </mat-form-field>
+
       </div>
     </mat-card-content>
     <mat-card-actions>
diff --git a/src/app/pages/jitsi/jitsi.component.ts b/src/app/pages/jitsi/jitsi.component.ts
index 4000ee0..c4e94ff 100644
--- a/src/app/pages/jitsi/jitsi.component.ts
+++ b/src/app/pages/jitsi/jitsi.component.ts
@@ -40,7 +40,7 @@ export class JitsiComponent implements OnInit {
     this.form = this.formBuilder.group({
       room: ['', Validators.required],
       starts: ['', Validators.nullValidator],
-      expires: ['', Validators.required],
+      expires: ['', Validators.nullValidator],
     });
 
     this.update();