diff --git a/Packages/PushNotifications/Sources/PushNotifications/PushManagerImpl.swift b/Packages/PushNotifications/Sources/PushNotifications/PushManagerImpl.swift
index 8cdf477f32..5db5ae7e1d 100644
--- a/Packages/PushNotifications/Sources/PushNotifications/PushManagerImpl.swift
+++ b/Packages/PushNotifications/Sources/PushNotifications/PushManagerImpl.swift
@@ -71,7 +71,7 @@ class PushManagerImpl: _PushManager {
     
     private func endpointURL(deviceToken: Data, accountID: String) -> URL {
         var endpoint = URLComponents(url: endpoint, resolvingAgainstBaseURL: false)!
-        let accountID = accountID.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
+        let accountID = accountID.addingPercentEncoding(withAllowedCharacters: .alphanumerics)!
         endpoint.path = "/push/v1/\(apnsEnvironment)/\(deviceToken.hexEncodedString())/\(accountID)"
         return endpoint.url!
     }