diff --git a/fastchat/serve/huggingface_api.py b/fastchat/serve/huggingface_api.py
index 8022fbc93..b15b8c998 100644
--- a/fastchat/serve/huggingface_api.py
+++ b/fastchat/serve/huggingface_api.py
@@ -48,7 +48,10 @@ def main(args):
     else:
         output_ids = output_ids[0][len(inputs["input_ids"][0]) :]
     outputs = tokenizer.decode(
-        output_ids, skip_special_tokens=True, spaces_between_special_tokens=False
+        output_ids,
+        skip_special_tokens=True,
+        spaces_between_special_tokens=False,
+        clean_up_tokenization_spaces=True,
     )
 
     # Print results