diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbdf4c663..a9c07ca36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# UNRELEASED
+- Replace case range with explicit case labels in OIDTokenUtilities. Addresses issue #947. ([#963](https://github.com/openid/AppAuth-iOS/pull/963))
+
 # 2.1.0
 - Add SwiftUI + Swift Package Manager sample app under `Examples/Example-iOS_Swift-SPM`. ([#952](https://github.com/openid/AppAuth-iOS/pull/952))
 - Removed external browser (Safari) fallback from `OIDExternalUserAgentIOS`. If `ASWebAuthenticationSession` fails to start (e.g., Guided Access is enabled), the authorization flow now fails with an error instead of opening an external browser. ([#954](https://github.com/openid/AppAuth-iOS/pull/954))
diff --git a/Sources/AppAuthCore/OIDTokenUtilities.m b/Sources/AppAuthCore/OIDTokenUtilities.m
index 3280c856c..9f9331f7e 100644
--- a/Sources/AppAuthCore/OIDTokenUtilities.m
+++ b/Sources/AppAuthCore/OIDTokenUtilities.m
@@ -61,7 +61,7 @@ + (NSString *)redact:(NSString *)inputString {
   switch(inputString.length){
     case 0:
       return @"";
-    case 1 ... 8:
+    case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
       return @"[redacted]";
     case 9:
     default: