diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcf8b5ca..cde48392 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,8 @@
   ([#2360][2360]).
 * Sixel: crash when using a shared palette and gamma-correct blending
   has been enabled, or foot is using 10-bit surface ([#2370][2370]).
+* Kitty text-size protocol: fix crash when text is zero-length
+  ([#2364][2364]).
 
 [2353]: https://codeberg.org/dnkl/foot/issues/2353
 [2352]: https://codeberg.org/dnkl/foot/issues/2352
@@ -109,6 +111,7 @@
 [2379]: https://codeberg.org/dnkl/foot/issues/2379
 [2360]: https://codeberg.org/dnkl/foot/issues/2360
 [2370]: https://codeberg.org/dnkl/foot/issues/2370
+[2364]: https://codeberg.org/dnkl/foot/issues/2364
 
 
 ### Security
diff --git a/osc.c b/osc.c
index 95af5bff..05281d0e 100644
--- a/osc.c
+++ b/osc.c
@@ -1149,6 +1149,9 @@ kitty_text_size(struct terminal *term, char *string)
     *text = '\0';
     text++;
 
+    if (text[0] == '\0')
+        return;
+
     char32_t *wchars = ambstoc32(text);
     if (wchars == NULL)
         return;