diff --git a/cmd/cloud-init-server/main.go b/cmd/cloud-init-server/main.go
index 3c2b3ddc3..298b198bd 100644
--- a/cmd/cloud-init-server/main.go
+++ b/cmd/cloud-init-server/main.go
@@ -251,11 +251,6 @@ func startServer() error {
 		openchami_logger.OpenCHAMILogger(log.Logger),
 	)
 
-	// Add WireGuard middleware if enabled
-	if wireguardOnly && wireGuardMiddleware != nil {
-		router.Use(wireGuardMiddleware)
-	}
-
 	// Setup routes
 	initCiClientRouter(router, handler, wgInterfaceManager)
 	initCiAdminRouter(router, handler)