diff --git a/CHANGELOG.md b/CHANGELOG.md
index b75171eb78..bce6daf846 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ Python versions: 3.11, 3.12, 3.13.
 - Fix: When an object was used as an On-Demand Task's category, and that object was then deleted,
   it caused an OnDemandHandler save error on reload. Will now clean up on save. (Griatch)
   used as the task's category (Griatch)
+- Fix: The testing 'echo' inputfunc didn't work correctly; now returns both args/kwargs (Griatch)
 - [Docs]: Fixes from InspectorCaracal, Griatch, ChrisLR
 
 [pull3633]: https://github.com/evennia/evennia/pull/3633
diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py
index d30b06d4a5..637c73456e 100644
--- a/evennia/server/inputfuncs.py
+++ b/evennia/server/inputfuncs.py
@@ -24,7 +24,6 @@ import importlib
 from codecs import lookup as codecs_lookup
 
 from django.conf import settings
-
 from evennia.accounts.models import AccountDB
 from evennia.commands.cmdhandler import cmdhandler
 from evennia.utils.logger import log_err
@@ -142,9 +141,9 @@ def echo(session, *args, **kwargs):
     Echo test function
     """
     if _STRIP_INCOMING_MXP:
-        txt = strip_mxp(txt)
+        args = [_maybe_strip_incoming_mxp(str(arg)) for arg in args]
 
-    session.data_out(text="Echo returns: %s" % args)
+    session.data_out(text=f"Echo returns: {args}, {kwargs}")
 
 
 def default(session, cmdname, *args, **kwargs):