diff --git a/src/frontend/app/ui/gallery/gallery.component.html b/src/frontend/app/ui/gallery/gallery.component.html
index f217d115..f95f7fe2 100644
--- a/src/frontend/app/ui/gallery/gallery.component.html
+++ b/src/frontend/app/ui/gallery/gallery.component.html
@@ -45,12 +45,12 @@
 
 
       <app-gallery-directories class="directories"
-                               [directories]="directoryContent.directories || []"></app-gallery-directories>
+                               [directories]="directoryContent?.directories || []"></app-gallery-directories>
 
       <div class="blog-map-row">
         <div class="blog-wrapper"
              [style.width]="blogOpen ?  '100%' : 'calc(100% - 100px)'"
-             *ngIf="config.Client.MetaFile.markdown  && directoryContent.metaFile && (directoryContent.metaFile | mdFiles).length>0">
+             *ngIf="config.Client.MetaFile.markdown  && directoryContent?.metaFile && (directoryContent.metaFile | mdFiles).length>0">
           <app-gallery-blog [collapsed]="!blogOpen"
                             [mdFiles]="directoryContent.metaFile | mdFiles"></app-gallery-blog>
 
@@ -60,10 +60,10 @@
           </button>
         </div>
         <app-gallery-map *ngIf="isPhotoWithLocation && mapEnabled"
-                         [photos]="directoryContent.media | photosOnly"
-                         [gpxFiles]="directoryContent.metaFile | gpxFiles"></app-gallery-map>
+                         [photos]="directoryContent?.media | photosOnly"
+                         [gpxFiles]="directoryContent?.metaFile | gpxFiles"></app-gallery-map>
       </div>
-      <app-gallery-grid [media]="directoryContent.media"
+      <app-gallery-grid [media]="directoryContent?.media"
                         [lightbox]="lightbox"></app-gallery-grid>
 
     </ng-container>