diff --git a/core/jvm/src/main/scala/org/hyperscala/Server.scala b/core/jvm/src/main/scala/org/hyperscala/Server.scala
index 86ce2f5..cd6022d 100644
--- a/core/jvm/src/main/scala/org/hyperscala/Server.scala
+++ b/core/jvm/src/main/scala/org/hyperscala/Server.scala
@@ -78,6 +78,10 @@ class Server(host: String, port: Int, sessionDomain: Option[String] = None, sess
     register(handler)
   }
 
+  def unregister(handler: Handler): Unit = synchronized {
+    handlers = handlers.filterNot(_ eq handler)
+  }
+
   override def handleRequest(exchange: HttpServerExchange): Unit = {
     exchange.putAttachment(SessionConfig.ATTACHMENT_KEY, sessionCookieConfig)
     Server.withServerSession(Sessions.getOrCreateSession(exchange)) {