diff --git a/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/server..st b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/server..st
new file mode 100644
index 00000000..5b02ee55
--- /dev/null
+++ b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/server..st
@@ -0,0 +1,5 @@
+accessing
+server: znServer
+	"Set my server to snServer, the one I am the delegate for"
+	
+	server := znServer
\ No newline at end of file
diff --git a/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/server.st b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/server.st
new file mode 100644
index 00000000..e2c1e368
--- /dev/null
+++ b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/server.st
@@ -0,0 +1,5 @@
+accessing
+server
+	"Return the ZnServer I was configured with, the one I am the delegate for"
+	
+	^ server
\ No newline at end of file
diff --git a/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/properties.json b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/properties.json
index c40ecd51..5bb0b589 100644
--- a/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/properties.json
+++ b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/properties.json
@@ -7,7 +7,8 @@
 	"classvars" : [ ],
 	"instvars" : [
 		"prefixMap",
-		"byteArray"
+		"byteArray",
+		"server"
 	],
 	"name" : "ZnDefaultServerDelegate",
 	"type" : "normal"
diff --git a/repository/Zinc-HTTP.package/ZnServer.class/instance/delegate.st b/repository/Zinc-HTTP.package/ZnServer.class/instance/delegate.st
index 085eaf5b..aff8179c 100644
--- a/repository/Zinc-HTTP.package/ZnServer.class/instance/delegate.st
+++ b/repository/Zinc-HTTP.package/ZnServer.class/instance/delegate.st
@@ -4,4 +4,6 @@ delegate
 	the object that will be sent #handleRequest: to handle a request and produce a response.
 	The default delegate is ZnDefaultServerDelegate"
 
-	^ self optionAt: #delegate ifAbsentPut: [ ZnDefaultServerDelegate new ]
\ No newline at end of file
+	^ self 
+		optionAt: #delegate
+		ifAbsentPut: [ ZnDefaultServerDelegate new server: self; yourself ]
\ No newline at end of file