diff --git a/installer/data/mysql/atomicupdate/bug_29495.perl b/installer/data/mysql/atomicupdate/bug_29495.perl
new file mode 100644
index 0000000000..1ba2e5ecd3
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_29495.perl
@@ -0,0 +1,10 @@
+$DBversion = 'XXX'; # will be replaced by the RM
+if( CheckVersion( $DBversion ) ) {
+    if ( foreign_key_exists( 'return_claims', 'issue_id' ) ) {
+        $dbh->do(q{
+            ALTER TABLE return_claims DROP FOREIGN KEY issue_id
+        });
+    }
+
+    NewVersion( $DBversion, 29495, "Issue link is lost in return claims when using 'MarkLostItemsAsReturned'");
+}
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 13a43b53c4..1c0cff7f31 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -4578,7 +4578,6 @@ CREATE TABLE return_claims (
     PRIMARY KEY (`id`),
     KEY `itemnumber` (`itemnumber`),
     CONSTRAINT UNIQUE `issue_id` ( issue_id ),
-    CONSTRAINT `issue_id` FOREIGN KEY (`issue_id`) REFERENCES `issues` (`issue_id`) ON DELETE SET NULL ON UPDATE CASCADE,
     CONSTRAINT `rc_items_ibfk` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
     CONSTRAINT `rc_borrowers_ibfk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
     CONSTRAINT `rc_created_by_ibfk` FOREIGN KEY (`created_by`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE,