diff --git a/installer/data/mysql/atomicupdate/fix_tmp_holdsqueue.pl b/installer/data/mysql/atomicupdate/fix_tmp_holdsqueue.pl
new file mode 100755
index 0000000000..8f9346d929
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/fix_tmp_holdsqueue.pl
@@ -0,0 +1,14 @@
+use Modern::Perl;
+
+return {
+    bug_number  => "34494",
+    description => "Fix tmp_holdsqueue for MySQL compatiability",
+    up          => sub {
+        my ($args) = @_;
+        my ( $dbh, $out ) = @$args{qw(dbh out)};
+
+        $dbh->do(q{
+            ALTER TABLE tmp_holdsqueue CHANGE COLUMN itemnumber `itemnumber` int(11) NOT NULL
+        });
+    },
+};
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 6f4fa28829..21f6ec015c 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -5870,7 +5870,7 @@ DROP TABLE IF EXISTS `tmp_holdsqueue`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `tmp_holdsqueue` (
   `biblionumber` int(11) DEFAULT NULL,
-  `itemnumber` int(11) DEFAULT NULL,
+  `itemnumber` int(11) NOT NULL,
   `barcode` varchar(20) DEFAULT NULL,
   `surname` longtext NOT NULL,
   `firstname` mediumtext DEFAULT NULL,