diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 55e8ec9396..a5fa10a4a4 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -23575,7 +23575,7 @@ if( CheckVersion( $DBversion ) ) {
         UPDATE items
         LEFT JOIN issues ON issues.itemnumber=items.itemnumber
         SET items.onloan=CAST(issues.date_due AS DATE)
-        WHERE items.onloan IS NULL
+        WHERE items.onloan IS NULL AND issues.issue_id IS NOT NULL
     |);
 
     NewVersion( $DBversion, 27808, "Adjust items.onloan if needed" );