diff --git a/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart b/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart
index fcc1d4440d..eec80b7d54 100644
--- a/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart
+++ b/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart
@@ -255,7 +255,7 @@ class ExifBottomSheet extends HookConsumerWidget {
                 ),
               ),
               subtitle: Text(
-                "ƒ/${exifInfo.fNumber}   ${exifInfo.exposureTime}   ${exifInfo.focalLength} mm   ISO${exifInfo.iso} ",
+                "ƒ/${exifInfo.fNumber}   ${exifInfo.exposureTime}   ${exifInfo.focalLength} mm   ISO ${exifInfo.iso ?? ''} ",
               ),
             ),
         ],
diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte
index c37b28b9a4..8791d89a5a 100644
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -207,14 +207,16 @@
       </div>
     {/if}
 
-    {#if asset.exifInfo?.fNumber}
+    {#if asset.exifInfo?.make || asset.exifInfo?.model || asset.exifInfo?.fNumber}
       <div class="flex gap-4 py-4">
         <div><CameraIris size="24" /></div>
 
         <div>
           <p>{asset.exifInfo.make || ''} {asset.exifInfo.model || ''}</p>
           <div class="flex gap-2 text-sm">
-            <p>{`ƒ/${asset.exifInfo.fNumber.toLocaleString($locale)}` || ''}</p>
+            {#if asset.exifInfo?.fNumber}
+              <p>{`ƒ/${asset.exifInfo.fNumber.toLocaleString($locale)}` || ''}</p>
+            {/if}
 
             {#if asset.exifInfo.exposureTime}
               <p>{`${asset.exifInfo.exposureTime}`}</p>
@@ -226,7 +228,7 @@
 
             {#if asset.exifInfo.iso}
               <p>
-                {`ISO${asset.exifInfo.iso}`}
+                {`ISO ${asset.exifInfo.iso}`}
               </p>
             {/if}
           </div>