diff --git a/src/v0/destinations/one_signal/transform.js b/src/v0/destinations/one_signal/transform.js
index a072aef0e4..b025660fa4 100644
--- a/src/v0/destinations/one_signal/transform.js
+++ b/src/v0/destinations/one_signal/transform.js
@@ -122,7 +122,7 @@ const trackResponseBuilder = (message, { Config }) => {
   if (!externalUserId) {
     throw new InstrumentationError('userId is required for track events/updating a device');
   }
-  endpoint = `${endpoint}/${appId}/users/${externalUserId}`;
+  endpoint = `${endpoint}/${appId}/users/${encodeURIComponent(externalUserId)}`;
   const payload = {};
   const tags = {};
   /* Populating event as true in tags.
@@ -163,7 +163,7 @@ const groupResponseBuilder = (message, { Config }) => {
   if (!externalUserId) {
     throw new InstrumentationError('userId is required for group events');
   }
-  endpoint = `${endpoint}/${appId}/users/${externalUserId}`;
+  endpoint = `${endpoint}/${appId}/users/${encodeURIComponent(externalUserId)}`;
   const payload = {};
   const tags = {
     groupId,
diff --git a/test/integrations/destinations/one_signal/processor/data.ts b/test/integrations/destinations/one_signal/processor/data.ts
index 7f244aa711..4171157aef 100644
--- a/test/integrations/destinations/one_signal/processor/data.ts
+++ b/test/integrations/destinations/one_signal/processor/data.ts
@@ -702,7 +702,7 @@ export const data = [
               headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
               version: '1',
               endpoint:
-                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user@27',
+                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user%4027',
               userId: '',
             },
             statusCode: 200,
@@ -789,7 +789,7 @@ export const data = [
               headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
               version: '1',
               endpoint:
-                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user@27',
+                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user%4027',
               userId: '',
             },
             statusCode: 200,
@@ -870,7 +870,7 @@ export const data = [
               headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
               version: '1',
               endpoint:
-                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user@27',
+                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user%4027',
               userId: '',
             },
             statusCode: 200,
@@ -945,7 +945,7 @@ export const data = [
               headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
               version: '1',
               endpoint:
-                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user@27',
+                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user%4027',
               userId: '',
             },
             statusCode: 200,
@@ -1025,7 +1025,7 @@ export const data = [
               headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
               version: '1',
               endpoint:
-                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user@27',
+                'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user%4027',
               userId: '',
             },
             statusCode: 200,
diff --git a/test/integrations/destinations/one_signal/router/data.ts b/test/integrations/destinations/one_signal/router/data.ts
index fe8460e45d..a27da5a745 100644
--- a/test/integrations/destinations/one_signal/router/data.ts
+++ b/test/integrations/destinations/one_signal/router/data.ts
@@ -199,7 +199,7 @@ export const data = [
                 headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
                 version: '1',
                 endpoint:
-                  'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user@27',
+                  'https://onesignal.com/api/v1/apps/random-818c-4a28-b98e-6cd8a994eb22/users/user%4027',
               },
               metadata: [{ jobId: 2, userId: 'u1' }],
               batched: false,