diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
index 002641faa..d47b419f3 100644
--- a/Tests/test_imagefont.py
+++ b/Tests/test_imagefont.py
@@ -585,7 +585,7 @@ class TestImageFont:
         assert t.getsize_multiline("A") == (12, 16)
         assert t.getsize_multiline("AB") == (24, 16)
         assert t.getsize_multiline("a") == (12, 16)
-        assert t.getsize_multiline("ABC\n") == (36, 36)
+        assert t.getsize_multiline("ABC\n") == (36, 16)
         assert t.getsize_multiline("ABC\nA") == (36, 36)
         assert t.getsize_multiline("ABC\nAaaa") == (48, 36)
 
diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py
index 8c66f7f6d..f1da5d708 100644
--- a/src/PIL/ImageDraw.py
+++ b/src/PIL/ImageDraw.py
@@ -498,7 +498,7 @@ class ImageDraw:
                 line, font, direction=direction, features=features, language=language
             )
             widths.append(line_width)
-            heighs.append(line_height + spacing)
+            heighs.append(line_height + spacing if line_height != 0 else 0)
             max_width = max(max_width, line_width)
 
         top = xy[1]
@@ -689,7 +689,6 @@ class ImageDraw:
                 direction=direction,
                 features=features,
                 language=language,
-                embedded_color=embedded_color,
             )
             widths.append(line_width)
             heighs.append(line_height + spacing)
diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
index 86563fdbf..c2a5b933f 100644
--- a/src/PIL/ImageFont.py
+++ b/src/PIL/ImageFont.py
@@ -492,7 +492,7 @@ class FreeTypeFont:
                 line, direction, features, language, stroke_width
             )
             max_width = max(max_width, line_width)
-            all_height += line_height + spacing
+            all_height += line_height + spacing if line_height != 0 else 0
 
         return max_width, all_height - spacing