diff --git a/Tests/test_image.py b/Tests/test_image.py
index 83dac70802f..039eb33d1ef 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -906,6 +906,13 @@ def test_zero_tobytes(self, size):
         im = Image.new("RGB", size)
         assert im.tobytes() == b""
 
+    @pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0)))
+    def test_zero_frombytes(self, size):
+        Image.frombytes("RGB", size, b"")
+
+        im = Image.new("RGB", size)
+        im.frombytes(b"")
+
     def test_has_transparency_data(self):
         for mode in ("1", "L", "P", "RGB"):
             im = Image.new(mode, (1, 1))
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index 771cb33c3de..cb092f1ae1f 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -791,6 +791,9 @@ def frombytes(self, data, decoder_name="raw", *args):
         but loads data into this image instead of creating a new image object.
         """
 
+        if self.width == 0 or self.height == 0:
+            return
+
         # may pass tuple instead of argument list
         if len(args) == 1 and isinstance(args[0], tuple):
             args = args[0]
@@ -2967,15 +2970,16 @@ def frombytes(mode, size, data, decoder_name="raw", *args):
 
     _check_size(size)
 
-    # may pass tuple instead of argument list
-    if len(args) == 1 and isinstance(args[0], tuple):
-        args = args[0]
+    im = new(mode, size)
+    if im.width != 0 and im.height != 0:
+        # may pass tuple instead of argument list
+        if len(args) == 1 and isinstance(args[0], tuple):
+            args = args[0]
 
-    if decoder_name == "raw" and args == ():
-        args = mode
+        if decoder_name == "raw" and args == ():
+            args = mode
 
-    im = new(mode, size)
-    im.frombytes(data, decoder_name, args)
+        im.frombytes(data, decoder_name, args)
     return im