diff --git a/changelog.d/6-federation/sft-brig-configmap-fix b/changelog.d/6-federation/sft-brig-configmap-fix
new file mode 100644
index 00000000000..d271b241cf3
--- /dev/null
+++ b/changelog.d/6-federation/sft-brig-configmap-fix
@@ -0,0 +1 @@
+Fix Brig's configmap for SFT lookups
diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml
index 88be747050b..2f7a0be6735 100644
--- a/charts/brig/templates/configmap.yaml
+++ b/charts/brig/templates/configmap.yaml
@@ -231,9 +231,11 @@ data:
       {{- if .setSftLookup }}
       {{- with .setSftLookup }}
       setSftLookup:
-        domain: {{ required "Missing value: .setSftLookup.domain" .setSftLookup.domain }}
-        port: {{ required "Missing value: .setSftLookup.port" .setSftLookup.port }}
-        isTestingEnvironment: {{ .setSftLookup.isTestingEnvironment }}
+        domain: {{ required "Missing value: .setSftLookup.domain" .domain }}
+        port: {{ required "Missing value: .setSftLookup.port" .port }}
+        {{- if .isTestingEnvironment }}
+        isTestingEnvironment: {{ .isTestingEnvironment }}
+        {{- end }}
       {{- end }}
       {{- end }}
     {{- end }}
diff --git a/services/brig/src/Brig/Options.hs b/services/brig/src/Brig/Options.hs
index ce19a26eded..798b5c1f988 100644
--- a/services/brig/src/Brig/Options.hs
+++ b/services/brig/src/Brig/Options.hs
@@ -720,8 +720,7 @@ Lens.makeLensesFor
     ("setUserMaxPermClients", "userMaxPermClients"),
     ("setFederationDomain", "federationDomain"),
     ("setSqsThrottleMillis", "sqsThrottleMillis"),
-    ("setSftStaticUrl", "sftStaticUrl"),
-    ("setSftLookup", "sftLookup")
+    ("setSftStaticUrl", "sftStaticUrl")
   ]
   ''Settings