diff --git a/src/py/extra/server.py b/src/py/extra/server.py
index c93d21f..657ffd3 100644
--- a/src/py/extra/server.py
+++ b/src/py/extra/server.py
@@ -362,7 +362,11 @@ def run(
         host=host, port=port, backlog=backlog, condition=condition, timeout=timeout
     )
     app = mount(*components)
-    asyncio.run(AIOSocketServer.Serve(app, options))
+    try:
+        asyncio.run(AIOSocketServer.Serve(app, options))
+    except KeyboardInterrupt:
+        event("ManualShutdown")
+    event("EOK")
 
 
 # EOF
diff --git a/src/py/extra/utils/logging.py b/src/py/extra/utils/logging.py
index 7a5b5f6..2d49211 100644
--- a/src/py/extra/utils/logging.py
+++ b/src/py/extra/utils/logging.py
@@ -213,7 +213,7 @@ def error(
 
 def event(
     event: str,
-    value: Any,
+    value: Any = None,
     *,
     origin: str | None = None,
     at: float | None = None,
@@ -235,7 +235,7 @@ def event(
 
 def notify(
     name: str,
-    value: Any,
+    value: Any = None,
     *,
     origin: str | None = None,
     at: float | None = None,