diff --git a/client/pages/viewerpage/image_exif.js b/client/pages/viewerpage/image_exif.js
index 1768bd14..ba68d258 100644
--- a/client/pages/viewerpage/image_exif.js
+++ b/client/pages/viewerpage/image_exif.js
@@ -88,7 +88,7 @@ class Exif extends React.Component {
                     metadata['PixelXDimension'],
                     metadata['PixelYDimension']
                 ] || null,
-                all: metadata
+                all: Object.keys(metadata).length === 0 ? null : metadata
             });
         });