diff --git a/src/library/text/par.rs b/src/library/text/par.rs
index d740df030..cf7dc4a96 100644
--- a/src/library/text/par.rs
+++ b/src/library/text/par.rs
@@ -824,6 +824,19 @@ fn line<'a>(
     mandatory: bool,
     hyphen: bool,
 ) -> Line<'a> {
+    if range.is_empty() {
+        return Line {
+            bidi: &p.bidi,
+            range,
+            first: None,
+            items: &[],
+            last: None,
+            width: Length::zero(),
+            mandatory,
+            dash: false,
+        };
+    }
+
     // Find the last item.
     let (last_idx, last_offset) =
         p.find_idx_and_offset(range.end.saturating_sub(1)).unwrap();
diff --git a/tests/ref/text/justify.png b/tests/ref/text/justify.png
index aa01016f8..d0b6c7bf0 100644
Binary files a/tests/ref/text/justify.png and b/tests/ref/text/justify.png differ
diff --git a/tests/typ/text/justify.typ b/tests/typ/text/justify.typ
index 24b6b99eb..3659f8efb 100644
--- a/tests/typ/text/justify.typ
+++ b/tests/typ/text/justify.typ
@@ -25,3 +25,9 @@ D
 #set page(width: 200pt)
 #set par(justify: true)
 中文维基百科使用汉字书写，汉字是汉族或华人的共同文字，是中国大陆、新加坡、马来西亚、台湾、香港、澳门的唯一官方文字或官方文字之一。25.9%，而美国和荷兰则分別占13.7%及8.2%。近年來，中国大陆地区的维基百科编辑者正在迅速增加；
+
+---
+// Test that there are no hick-ups with justification enabled and
+// basically empty paragraph.
+#set par(justify: true)
+{""}