diff --git a/frontend/src/components/ChatComponents/Type.js b/frontend/src/components/ChatComponents/Type.js
index 520911d..879e906 100644
--- a/frontend/src/components/ChatComponents/Type.js
+++ b/frontend/src/components/ChatComponents/Type.js
@@ -44,7 +44,7 @@ export default function Type() {
 
   const messageHandler = (e) => {
     setMessage(e.target.value);
-
+    if (!message) return;
     if (!socketConnected) return;
 
     if (!typing) {
@@ -88,12 +88,13 @@ export default function Type() {
   const sendMessage = async (event) => {
     if (message.length === 0) return;
 
-    if (event.key === "Enter" || event.type === "click") {
+    if ((event.type === "keydown" && event.key === "Enter" && !event.shiftKey) || event.type === "click") {
       event.preventDefault();
+      if (!message.trim()) return;
       const cookie = localStorage.getItem("jwt");
       const bodyData = {
         chatId: isSet._id,
-        content: message,
+        content: message.trim()
       };
       setMessage("");
       resetTranscript();