diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml
index ae8797adb..71a274bfb 100644
--- a/imports/NeoChat/Component/ChatBox/ChatBar.qml
+++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml
@@ -122,7 +122,7 @@ ToolBar {
 
                 Timer {
                     id: repeatTimer
-                    interval: 3000
+                    interval: 5000
                 }
 
                 function sendMessage(event) {
@@ -131,6 +131,7 @@ ToolBar {
                     } else if (event.modifiers & Qt.ShiftModifier) {
                         inputField.insert(cursorPosition, "\n")
                     } else {
+                        currentRoom.sendTypingNotification(false)
                         chatBar.postMessage()
                     }
                     isCompleting = false;
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 09d527770..08fcd5e53 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -130,7 +130,7 @@ QVariantList NeoChatRoom::getUsersTyping() const
 
 void NeoChatRoom::sendTypingNotification(bool isTyping)
 {
-    connection()->callApi<SetTypingJob>(BackgroundRequest, localUser()->id(), id(), isTyping, 3000);
+    connection()->callApi<SetTypingJob>(BackgroundRequest, localUser()->id(), id(), isTyping, 10000);
 }
 
 const RoomMessageEvent *NeoChatRoom::lastEvent(bool ignoreStateEvent) const