diff --git a/hscontrol/app.go b/hscontrol/app.go
index 26311f39e..22c0a2668 100644
--- a/hscontrol/app.go
+++ b/hscontrol/app.go
@@ -446,7 +446,7 @@ func (h *Headscale) createRouter(apiV1Mux, apiV2Mux http.Handler) *chi.Mux {
 		Host:  false,
 		Proto: true,
 		Skip: func(r *http.Request) bool {
-			return r.Method != http.MethodOptions
+			return r.Method == http.MethodOptions
 		},
 	}))
 	r.Use(middleware.RequestID)
diff --git a/hscontrol/noise.go b/hscontrol/noise.go
index 3c6bb6e2a..615d63bd3 100644
--- a/hscontrol/noise.go
+++ b/hscontrol/noise.go
@@ -150,7 +150,7 @@ func (h *Headscale) NoiseUpgradeHandler(
 		Host:  false,
 		Proto: true,
 		Skip: func(r *http.Request) bool {
-			return r.Method != http.MethodOptions
+			return r.Method == http.MethodOptions
 		},
 	}))
 	r.Use(middleware.RequestID)