diff --git a/src/lib/isISO6346.js b/src/lib/isISO6346.js
index 2c28c1123..597f0b2fd 100644
--- a/src/lib/isISO6346.js
+++ b/src/lib/isISO6346.js
@@ -3,7 +3,7 @@ import assertString from './util/assertString';
 // https://en.wikipedia.org/wiki/ISO_6346
 // according to ISO6346 standard, checksum digit is mandatory for freight container but recommended
 // for other container types (J and Z)
-const isISO6346Str = /^[A-Z]{3}(U[0-9]{7})|([J,Z][0-9]{6,7})$/;
+const isISO6346Str = /^[A-Z]{3}(?:U[0-9]{7}|[JZ][0-9]{6,7})$/;
 const isDigit = /^[0-9]$/;
 
 export function isISO6346(str) {
diff --git a/test/validators.test.js b/test/validators.test.js
index 98d2a12ff..95570b5d4 100644
--- a/test/validators.test.js
+++ b/test/validators.test.js
@@ -13615,6 +13615,9 @@ describe('Validators', () => {
         'ECMJ4657496',
         'TBJA7176445',
         'AFFU5962593',
+        'ABCU1234567HELLO',
+        'JUNKJ1234567',
+        'AB,1234567',
       ],
     });
   });
@@ -13640,6 +13643,9 @@ describe('Validators', () => {
         'ECMJ4657496',
         'TBJA7176445',
         'AFFU5962593',
+        'ABCU1234567HELLO',
+        'JUNKJ1234567',
+        'AB,1234567',
       ],
     });
   });