From fd9aa986d9ad362d57d9dd0691b73f76f4ea48a7 Mon Sep 17 00:00:00 2001
From: fuomag9 <1580624+fuomag9@users.noreply.github.com>
Date: Mon, 23 Feb 2026 08:11:59 +0100
Subject: [PATCH] fix: correct enabled logic in geoblock merge and route
 injection

---
 src/lib/caddy.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/caddy.ts b/src/lib/caddy.ts
index 811f645f..385816db 100644
--- a/src/lib/caddy.ts
+++ b/src/lib/caddy.ts
@@ -715,7 +715,7 @@ function mergeGeoBlockSettings(
   host: GeoBlockSettings
 ): GeoBlockSettings {
   return {
-    enabled: host.enabled,
+    enabled: host.enabled || global.enabled,
     block_countries: [...(global.block_countries ?? []), ...(host.block_countries ?? [])],
     block_continents: [...(global.block_continents ?? []), ...(host.block_continents ?? [])],
     block_asns: [...(global.block_asns ?? []), ...(host.block_asns ?? [])],
@@ -843,7 +843,7 @@ async function buildProxyRoutes(
       options.globalGeoBlock ?? null,
       { geoblock: meta.geoblock ?? null, geoblock_mode: meta.geoblock_mode ?? "merge" }
     );
-    if (effectiveGeoBlock) {
+    if (effectiveGeoBlock?.enabled) {
       handlers.unshift(buildBlockerHandler(effectiveGeoBlock));
     }