diff --git a/modules/ircv3_typing.py b/modules/ircv3_typing.py
index ca2fce2b..3c8c9c6d 100644
--- a/modules/ircv3_typing.py
+++ b/modules/ircv3_typing.py
@@ -9,10 +9,13 @@ class Module(ModuleManager.BaseModule):
     def _has_tags(self, server):
         return server.has_capability(CAP)
 
+    def _expect_output(self, event):
+        kwarg = event["hook"].get_kwarg("expect_output", None)
+        return kwarg if not kwarg is None else event["expect_output"]
+
     @utils.hook("preprocess.command")
     def preprocess(self, event):
-        if (self._has_tags(event["server"]) and
-                event["hook"].get_kwarg("expect_output", True)):
+        if self._has_tags(event["server"]) and self._expect_output(event):
             event["target"]._typing = True
             event["server"].send(self._tagmsg(event["target_str"], "active"),
                 immediate=True)
diff --git a/src/core_modules/commands/__init__.py b/src/core_modules/commands/__init__.py
index 9822903f..6590a350 100644
--- a/src/core_modules/commands/__init__.py
+++ b/src/core_modules/commands/__init__.py
@@ -320,7 +320,7 @@ class Module(ModuleManager.BaseModule):
                 self.command(event["server"], event["channel"],
                     event["target_str"], True, event["user"], command,
                     args_split, event["line"], hook,
-                    command_prefix=command_prefix,
+                    command_prefix=command_prefix, expect_output=True,
                     buffer_line=event["buffer_line"])
             else:
                 self.events.on("unknown.command").call(server=event["server"],
@@ -345,7 +345,7 @@ class Module(ModuleManager.BaseModule):
                             event["target_str"], True, event["user"], command,
                             "", event["line"], hook, match=match,
                             message=event["message"], command_prefix="",
-                            action=event["action"],
+                            action=event["action"], expect_output=False,
                             buffer_line=event["buffer_line"])
 
                         if res: