diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml
index 71a274bfb..2b469bd4b 100644
--- a/imports/NeoChat/Component/ChatBox/ChatBar.qml
+++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml
@@ -229,7 +229,7 @@ ToolBar {
                 }
 
                 onTextChanged: {
-                    if (!repeatTimer.running) {
+                    if (!repeatTimer.running && Config.typingNotifications) {
                         currentRoom.sendTypingNotification(true)
                     }
                     repeatTimer.start()
diff --git a/imports/NeoChat/Settings/GeneralSettingsPage.qml b/imports/NeoChat/Settings/GeneralSettingsPage.qml
index 791f7d89a..e2728602a 100644
--- a/imports/NeoChat/Settings/GeneralSettingsPage.qml
+++ b/imports/NeoChat/Settings/GeneralSettingsPage.qml
@@ -110,6 +110,15 @@ Kirigami.ScrollablePage {
                     Config.save()
                 }
             }
+            QQC2.CheckBox {
+                text: i18n("Send Typing Notifications")
+                checked: Config.typingNotifications
+                enabled: !Config.isTypingNotificationsImmutable
+                onToggled: {
+                    Config.typingNotifications = checked
+                    Config.save()
+                }
+            }
         }
     }
 }
diff --git a/src/neochatconfig.kcfg b/src/neochatconfig.kcfg
index 12fa3b0e4..1b0fe52a2 100644
--- a/src/neochatconfig.kcfg
+++ b/src/neochatconfig.kcfg
@@ -51,6 +51,9 @@
     <entry name="RoomDrawerWidth" type="int">
       <default>-1</default>
     </entry>
+    <entry name="TypingNotifications" type="bool">
+      <default>true</default>
+    </entry>
   </group>
   <group name="Timeline">
     <entry name="ShowAvatarInTimeline" type="bool">