diff --git a/fastchat/conversation.py b/fastchat/conversation.py
index 763856f85..869bfd4bf 100644
--- a/fastchat/conversation.py
+++ b/fastchat/conversation.py
@@ -204,12 +204,12 @@ def get_prompt(self) -> str:
         elif self.sep_style == SeparatorStyle.FALCON_CHAT:
             ret = ""
             if self.system_message:
-                ret += "System: " + self.system_message + self.sep
+                ret += system_prompt + self.sep
             for role, message in self.messages:
                 if message:
                     ret += role + ": " + message + self.sep
                 else:
-                    ret += role + ": "
+                    ret += role + ":"
 
             return ret
         else:
@@ -958,6 +958,7 @@ def get_conv_template(name: str) -> Conversation:
     Conversation(
         name="falcon-chat",
         roles=("User", "Falcon"),
+        system_template="System: {system_message}",
         messages=[],
         sep_style=SeparatorStyle.FALCON_CHAT,
         sep="\n",