diff --git a/lib/main.dart b/lib/main.dart
index d53214c9f..e18776541 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,5 +1,5 @@
-import 'package:aves/model/image_decode_service.dart';
 import 'package:aves/model/image_entry.dart';
+import 'package:aves/model/image_file_service.dart';
 import 'package:aves/model/image_metadata.dart';
 import 'package:aves/model/metadata_db.dart';
 import 'package:aves/widgets/album/all_collection_page.dart';
@@ -59,7 +59,7 @@ class _HomePageState extends State<HomePage> {
           },
           onError: (error) => debugPrint('mediastore stream error=$error'),
         );
-    await ImageDecodeService.getImageEntries();
+    await ImageFileService.getImageEntries();
   }
 
   @override
diff --git a/lib/model/image_entry.dart b/lib/model/image_entry.dart
index a986b7850..2a1cfd1be 100644
--- a/lib/model/image_entry.dart
+++ b/lib/model/image_entry.dart
@@ -1,6 +1,6 @@
 import 'dart:collection';
 
-import 'package:aves/model/image_decode_service.dart';
+import 'package:aves/model/image_file_service.dart';
 import 'package:aves/model/image_metadata.dart';
 import 'package:aves/model/metadata_service.dart';
 import 'package:flutter/material.dart';
@@ -191,7 +191,7 @@ class ImageEntry with ChangeNotifier {
   Future<bool> rename(String newName) async {
     if (newName == filename) return true;
 
-    final newFields = await ImageDecodeService.rename(this, '$newName${extension(this.path)}');
+    final newFields = await ImageFileService.rename(this, '$newName${extension(this.path)}');
     if (newFields.isEmpty) return false;
 
     final uri = newFields['uri'];
diff --git a/lib/model/image_decode_service.dart b/lib/model/image_file_service.dart
similarity index 98%
rename from lib/model/image_decode_service.dart
rename to lib/model/image_file_service.dart
index 3ded37b09..f66c10577 100644
--- a/lib/model/image_decode_service.dart
+++ b/lib/model/image_file_service.dart
@@ -4,7 +4,7 @@ import 'package:aves/model/image_entry.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-class ImageDecodeService {
+class ImageFileService {
   static const platform = const MethodChannel('deckers.thibault/aves/image');
 
   static getImageEntries() async {
diff --git a/lib/widgets/album/thumbnail.dart b/lib/widgets/album/thumbnail.dart
index 9b2a0c688..a0fc41d02 100644
--- a/lib/widgets/album/thumbnail.dart
+++ b/lib/widgets/album/thumbnail.dart
@@ -1,8 +1,8 @@
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:aves/model/image_decode_service.dart';
 import 'package:aves/model/image_entry.dart';
+import 'package:aves/model/image_file_service.dart';
 import 'package:aves/widgets/album/thumbnail_tags.dart';
 import 'package:flutter/material.dart';
 import 'package:transparent_image/transparent_image.dart';
@@ -45,12 +45,12 @@ class ThumbnailState extends State<Thumbnail> {
 
   initByteLoader() {
     final dim = (widget.extent * widget.devicePixelRatio).round();
-    _byteLoader = ImageDecodeService.getImageBytes(widget.entry, dim, dim);
+    _byteLoader = ImageFileService.getImageBytes(widget.entry, dim, dim);
   }
 
   @override
   void dispose() {
-    ImageDecodeService.cancelGetImageBytes(uri);
+    ImageFileService.cancelGetImageBytes(uri);
     super.dispose();
   }
 
diff --git a/lib/widgets/fullscreen/info/metadata_section.dart b/lib/widgets/fullscreen/info/metadata_section.dart
index 3c1b843cc..eeee70e43 100644
--- a/lib/widgets/fullscreen/info/metadata_section.dart
+++ b/lib/widgets/fullscreen/info/metadata_section.dart
@@ -60,6 +60,7 @@ class MetadataSectionState extends State<MetadataSection> {
                     ),
                   ...tagKeys.map((tagKey) {
                     final value = directory[tagKey] as String;
+                    if (value == null || value.isEmpty) return SizedBox.shrink();
                     return InfoRow(tagKey, value.length > maxValueLength ? '${value.substring(0, maxValueLength)}…' : value);
                   }),
                   SizedBox(height: 16),