diff --git a/Tests/images/xmp_padded.jpg b/Tests/images/xmp_padded.jpg
new file mode 100644
index 000000000..9ecfb3efe
Binary files /dev/null and b/Tests/images/xmp_padded.jpg differ
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index 0247527f5..904fecebf 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -898,6 +898,14 @@ class TestFileJpeg:
             with Image.open("Tests/images/hopper.jpg") as im:
                 assert im.getxmp() == {}
 
+    def test_getxmp_padded(self):
+        with Image.open("Tests/images/xmp_padded.jpg") as im:
+            if ElementTree is None:
+                with pytest.warns(UserWarning):
+                    assert im.getxmp() == {}
+            else:
+                assert im.getxmp() == {"xmpmeta": None}
+
     @pytest.mark.timeout(timeout=1)
     def test_eof(self):
         # Even though this decoder never says that it is finished
diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
index dfc7e6e9f..a28cd0367 100644
--- a/src/PIL/JpegImagePlugin.py
+++ b/src/PIL/JpegImagePlugin.py
@@ -496,7 +496,7 @@ class JpegImageFile(ImageFile.ImageFile):
 
         for segment, content in self.applist:
             if segment == "APP1":
-                marker, xmp_tags = content.rsplit(b"\x00", 1)
+                marker, xmp_tags = content.split(b"\x00")[:2]
                 if marker == b"http://ns.adobe.com/xap/1.0/":
                     return self._getxmp(xmp_tags)
         return {}