diff --git a/lib/model/image_metadata.dart b/lib/model/image_metadata.dart
index 22db0a610..c2ef37a23 100644
--- a/lib/model/image_metadata.dart
+++ b/lib/model/image_metadata.dart
@@ -20,8 +20,8 @@ class CatalogMetadata {
   factory CatalogMetadata.fromMap(Map map) {
     return CatalogMetadata(
       contentId: map['contentId'],
-      dateMillis: map['dateMillis'],
-      xmpSubjects: map['xmpSubjects'],
+      dateMillis: map['dateMillis'] ?? 0,
+      xmpSubjects: map['xmpSubjects'] ?? '',
       latitude: map['latitude'],
       longitude: map['longitude'],
     );
@@ -53,13 +53,15 @@ class OverlayMetadata {
 
   factory OverlayMetadata.fromMap(Map map) {
     return OverlayMetadata(
-      aperture: map['aperture'],
-      exposureTime: map['exposureTime'],
-      focalLength: map['focalLength'],
-      iso: map['iso'],
+      aperture: map['aperture'] ?? '',
+      exposureTime: map['exposureTime'] ?? '',
+      focalLength: map['focalLength'] ?? '',
+      iso: map['iso'] ?? '',
     );
   }
 
+  bool get isEmpty => aperture.isEmpty && exposureTime.isEmpty && focalLength.isEmpty && iso.isEmpty;
+
   @override
   String toString() {
     return 'OverlayMetadata{aperture=$aperture, exposureTime=$exposureTime, focalLength=$focalLength, iso=$iso}';
diff --git a/lib/widgets/fullscreen/overlay_bottom.dart b/lib/widgets/fullscreen/overlay_bottom.dart
index f4d6fab53..097c360ab 100644
--- a/lib/widgets/fullscreen/overlay_bottom.dart
+++ b/lib/widgets/fullscreen/overlay_bottom.dart
@@ -130,7 +130,7 @@ class _FullscreenBottomOverlayContent extends StatelessWidget {
               ],
             ),
           ),
-          if (details != null) ...[
+          if (details != null && !details.isEmpty) ...[
             SizedBox(height: 4),
             SizedBox(
               width: subRowWidth,