diff --git a/code/client/src/core/ui/chat.cpp b/code/client/src/core/ui/chat.cpp
index 0a85d25..6475f0d 100644
--- a/code/client/src/core/ui/chat.cpp
+++ b/code/client/src/core/ui/chat.cpp
@@ -85,7 +85,9 @@ namespace MafiaMP::Core::UI {
 
             if (_wasFocused && gApplication->GetInput()->IsKeyPressed(FW_KEY_RETURN)) {
                 if (strlen(_inputText)) {
-                    onMessageSentProc(_inputText);
+                    if (!ProcessBuiltinCommand()) {
+                        onMessageSentProc(_inputText);
+                    }
                     _history.emplace(_history.begin(), _inputText);
                     strcpy(_inputText, "");
                 }
@@ -98,4 +100,17 @@ namespace MafiaMP::Core::UI {
 
         ImGui::End();
     }
+
+    void Chat::Clear() {
+        _chatMessages.clear();
+    }
+
+    bool Chat::ProcessBuiltinCommand() {
+        if (std::strcmp(_inputText, "/clear") == 0 || std::strcmp(_inputText, "/cls") == 0) {
+            Clear();
+            return true;
+        }
+
+        return false;
+    }
 } // namespace MafiaMP::Core::UI
diff --git a/code/client/src/core/ui/chat.h b/code/client/src/core/ui/chat.h
index 1f3ab7b..f2ea45d 100644
--- a/code/client/src/core/ui/chat.h
+++ b/code/client/src/core/ui/chat.h
@@ -45,5 +45,8 @@ namespace MafiaMP::Core::UI {
             _chatMessages.push_back(msg);
             _newMsgArrived = true;
         }
+
+        void Clear();
+        bool ProcessBuiltinCommand();
     };
 } // namespace MafiaMP::Core::UI