diff --git a/src/bin/empc.c b/src/bin/empc.c
index a60f9fa..dc20523 100644
--- a/src/bin/empc.c
+++ b/src/bin/empc.c
@@ -435,7 +435,7 @@ save_image(Eina_Bool force, Evas_Object *img, const char *uri, const char *artis
      {
         Empc_Module_Metadata_Save *es = (Empc_Module_Metadata_Save *)mod;
         INF("IMAGE SAVE(%s)", strrchr(eina_module_file_get(mod->module), '/') + 1);
-        if (es->save_image) es->save_image(nosave && override ? NULL : img, uri, artist, album);
+        if (es->save_image) es->save_image(img, uri, artist, album);
      }
 }
 
diff --git a/src/modules/eet_saver.c b/src/modules/eet_saver.c
index 52782f0..b3b94bf 100644
--- a/src/modules/eet_saver.c
+++ b/src/modules/eet_saver.c
@@ -62,14 +62,26 @@ empc_module_metadata_save_image(Evas_Object *obj, const char *uri, const char *a
    snprintf(buf, sizeof(buf), "%s:::%s", a ?: "", b ?: "");
    if (obj)
      {
-        o = elm_image_object_get(obj);
-        img = evas_object_image_data_get(o, EINA_FALSE);
-        if (img)
+        if (evas_object_data_get(obj, "__empc_nosave"))
           {
-             evas_object_image_size_get(o, &w, &h);
-             eet_data_image_write(ef_img, buf, img, w, h, 0, 1, 100, 0);
+             Eina_Stringshare *f;
+
+             /* filesystem loader image; save location to hash but not image */
+             elm_image_file_get(obj, &f, NULL);
+             eet_delete(ef_img, buf);
+             eet_hash_set(ef_img, buf, f);
+          }
+        else
+          {
+             o = elm_image_object_get(obj);
+             img = evas_object_image_data_get(o, EINA_FALSE);
+             if (img)
+               {
+                  evas_object_image_size_get(o, &w, &h);
+                  eet_data_image_write(ef_img, buf, img, w, h, 0, 1, 100, 0);
+               }
+             eet_hash_set(ef_img, buf, evas_object_data_get(obj, "__empc_url"));
           }
-        eet_hash_set(ef_img, buf, evas_object_data_get(obj, "__empc_url"));
      }
    else if (uri)
      eet_write(ef_img, buf, uri, strlen(uri), 1);