diff --git a/libs/shared/logging/src/lib/redact-sensitive-data.spec.ts b/libs/shared/logging/src/lib/redact-sensitive-data.spec.ts
index 4dd981e37..e0a30aced 100644
--- a/libs/shared/logging/src/lib/redact-sensitive-data.spec.ts
+++ b/libs/shared/logging/src/lib/redact-sensitive-data.spec.ts
@@ -196,6 +196,28 @@ describe('redactSensitiveData', () => {
         expect(output).toContain('"status":200');
     });
 
+    it('redacts Map values selected by sensitive keys', () => {
+        const authorization = 'map-authorization-secret';
+        const password = 'map-password-secret';
+        const headers = new Map([
+            ['Authorization', `Bearer ${authorization}`],
+            ['password', password],
+            ['requestId', 'diagnostic-request-id'],
+        ]);
+
+        const result = redactSensitiveData(headers);
+        const output = serialized(result);
+
+        expect(output).not.toContain(authorization);
+        expect(output).not.toContain(password);
+        expect(output).toContain('diagnostic-request-id');
+        expect(result).toEqual({
+            Authorization: REDACTED_VALUE,
+            password: REDACTED_VALUE,
+            requestId: 'diagnostic-request-id',
+        });
+    });
+
     it('redacts Xtream credentials in playback URL paths', () => {
         const username = 'xtream-path-user-secret';
         const password = 'xtream-path-password-secret';
diff --git a/libs/shared/logging/src/lib/redact-sensitive-data.ts b/libs/shared/logging/src/lib/redact-sensitive-data.ts
index 27f8ff81e..fb24f78e4 100644
--- a/libs/shared/logging/src/lib/redact-sensitive-data.ts
+++ b/libs/shared/logging/src/lib/redact-sensitive-data.ts
@@ -357,10 +357,13 @@ export function redactSensitiveData(
                     resolved.maxObjectKeys
                 );
                 for (const [key, entry] of mapEntries) {
-                    entries[visitString(String(key), depth + 1)] = visit(
-                        entry,
-                        depth + 1
-                    );
+                    const stringKey = String(key);
+                    const redactedKey = visitString(stringKey, depth + 1);
+                    entries[redactedKey] =
+                        isSensitiveKey(stringKey) &&
+                        !/[/:?=&]/u.test(stringKey)
+                            ? REDACTED_VALUE
+                            : visit(entry, depth + 1);
                 }
                 if (input.size > resolved.maxObjectKeys) {
                     entries['__truncatedKeys'] =