diff --git a/src/photograph.vala b/src/photograph.vala
index 4301c2d98b48d2b556cdef81d4dfce68bcb53626..8e49a1748c7838b968d0ffc57cfeaa52679c0aad 100644
--- a/src/photograph.vala
+++ b/src/photograph.vala
@@ -173,17 +173,14 @@ namespace GQPE {
          * @throws GLib.Error if there is an error while loading.
          */
         public void save_metadata() throws GLib.Error {
-            if (album == "")
-                metadata.clear_tag(Tag.SUBJECT);
-            else
+            metadata.clear_tag(Tag.SUBJECT);
+            if (album != "")
                 metadata.set_tag_string(Tag.SUBJECT, album);
-            if (caption == "")
-                metadata.clear_tag(Tag.CAPTION);
-            else
+            metadata.clear_tag(Tag.CAPTION);
+            if (caption != "")
                 metadata.set_tag_string(Tag.CAPTION, caption);
+            metadata.clear_tag(Tag.DESCRIPTION);
             if (comment != "")
-                metadata.clear_tag(Tag.DESCRIPTION);
-            else
                 metadata.set_tag_string(Tag.DESCRIPTION, comment);
             metadata.set_tag_long(Tag.ORIENTATION, orientation);
             metadata.save_file(file.get_path());