diff --git a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html
index a0315237..f19c7963 100644
--- a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html
+++ b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.html
@@ -27,12 +27,7 @@
     </div>
     <div class="col-10">
       <div class="details-main">
-        <ng-container *ngIf="getYear() !== getCurrentYear()">
-          {{ photo.metadata.creationDate | date :'longDate'}}
-        </ng-container>
-        <ng-container *ngIf="getYear() === getCurrentYear()">
-          {{ photo.metadata.creationDate | date :'MMMM d'}}
-        </ng-container>
+        {{ photo.metadata.creationDate | date: (isThisYear() ? 'MMMM d': 'longDate')}}
       </div>
       <div class="details-sub row">
         <div class="col-12">{{ photo.metadata.creationDate | date :'EEEE'}}, {{getTime()}}</div>
diff --git a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts
index 369422f8..dabce203 100644
--- a/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts
+++ b/frontend/app/gallery/lightbox/infopanel/info-panel.lightbox.gallery.component.ts
@@ -31,8 +31,9 @@ export class InfoPanelLightboxComponent {
     return size.toFixed(2) + postFixes[index];
   }
 
-  getCurrentYear() {
-    return (new Date()).getFullYear();
+  isThisYear() {
+    return (new Date()).getFullYear() ===
+      (new Date(this.photo.metadata.creationDate)).getFullYear();
   }