diff --git a/admin/themes/default/js/history.js b/admin/themes/default/js/history.js
index 7ad23d3a4..c7a0d3b08 100644
--- a/admin/themes/default/js/history.js
+++ b/admin/themes/default/js/history.js
@@ -301,7 +301,18 @@ function lineConstructor(line, id, imageDisplay) {
       fillHistoryResult(current_param);
     });
   }
-  newLine.find(".edit-img").attr("href", line.EDIT_IMAGE)
+
+  if (line.EDIT_IMAGE != "") {
+    newLine.find(".edit-img").attr("href", line.EDIT_IMAGE);
+  } else {
+    newLine.find(".edit-img")
+      .attr("href", "#")
+      .addClass("notClickable tiptip")
+      .attr('title', str_no_longer_exist_photo)
+      .on("click", (e) => {
+      e.preventDefault();
+    });
+  }
 
   switch (line.SECTION) {
     case "tags":
diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl
index 6d21c8cef..de6752429 100644
--- a/admin/themes/default/template/history.tpl
+++ b/admin/themes/default/template/history.tpl
@@ -41,6 +41,7 @@ const str_favorites = "{'Your favorites'|translate}";
 const str_recent_cats = "{'Recent albums'|translate}";
 const str_recent_pics = "{'Recent photos'|translate}";
 const str_memories = "{'Memories'|translate}";
+const str_no_longer_exist_photo = "{'This photo no longer exists'|@translate}";
 const unit_MB = "{"%s MB"|@translate}";
 const str_guest = '{'guest'|@translate}';
 const guest_id = {$guest_id};
@@ -276,6 +277,10 @@ jQuery(document).ready( function() {
 
 <style>
 
+.notClickable {
+  opacity: 0.5;
+}
+
 .container {
   padding: 0 20px;
 }
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php
index 96cea0136..d73111586 100644
--- a/include/ws_functions/pwg.php
+++ b/include/ws_functions/pwg.php
@@ -964,6 +964,7 @@ SELECT
       }
       else
       {
+        $image_edit_string = '';
         $image_title.= ' unknown filename';
       }
 
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index f28ec5de4..d6ba817be 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1317,4 +1317,5 @@ $lang['Delete %s format ?'] = 'Delete %s format ?';
 $lang['Installed on %s, %s'] = 'Installed on %s, %s';
 $lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset';
 $lang['This picture is physically linked to this album, you can\'t dissociate them'] = 'This picture is physically linked to this album, you can\'t dissociate them.';
+$lang['This photo no longer exists'] = 'This photo no longer exists';
 // Leave this line empty
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 58ba786a8..697922d55 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1319,4 +1319,5 @@ $lang['Delete %s format ?'] = 'Supprimer le format %s ?';
 $lang['Installed on %s, %s'] = 'Installé le %s, %s';
 $lang['While restoring this plugin, it will be reset to its original parameters and associated data is going to be reset'] = 'En restaurant ce plugin, il reviendra à son paramétrage d’origine et les données associées seront remises à zero';
 $lang['This picture is physically linked to this album, you can\'t dissociate them'] = 'Cette photo est physiquement liée à cet album, vous ne pouvez pas les dissocier.';
+$lang['This photo no longer exists'] = 'Cette photo n\'existe plus';
 // Leave this line empty