diff --git a/src/string_with_vars.ml b/src/string_with_vars.ml
index 28aa90dc..0ed7a62c 100644
--- a/src/string_with_vars.ml
+++ b/src/string_with_vars.ml
@@ -170,6 +170,8 @@ let partial_expand t ~mode ~dir ~f =
       end
   in
   match t.items with
+  | [] -> Partial.Expanded (Mode.string mode "")
+  | [Text s] -> Expanded (Mode.string mode s)
   | [Var (syntax, v)] when not t.quoted ->
     (* Unquoted single var *)
     begin match f syntax t.loc v with