diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index 0a10d47eb..1c0dfaade 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -689,7 +689,7 @@ Loop:
 		case currItem.IsDone():
 			if !currItem.IsError() {
 				if !closed && sc.needsInner() {
-					return sc, fmt.Errorf("%s: unclosed shortcode %q", errorPrefix, sc.name)
+					return sc, fmt.Errorf("%s: shortcode %q must be closed or self-closed", errorPrefix, sc.name)
 				}
 			}
 			// handled by caller
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index eac3de2ce..67c83f44e 100644
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -1274,5 +1274,5 @@ Inner: {{ .Get 0 }}: {{ len .Inner }}
 	).BuildE()
 
 	b.Assert(err, qt.Not(qt.IsNil))
-	b.Assert(err.Error(), qt.Contains, `p1.md:5:1": failed to extract shortcode: unclosed shortcode "sc"`)
+	b.Assert(err.Error(), qt.Contains, `p1.md:5:1": failed to extract shortcode: shortcode "sc" must be closed or self-closed`)
 }