diff --git a/sdk/core/core-amqp/review/core-amqp.api.md b/sdk/core/core-amqp/review/core-amqp.api.md
index 044f81a0935..fbac4d42015 100644
--- a/sdk/core/core-amqp/review/core-amqp.api.md
+++ b/sdk/core/core-amqp/review/core-amqp.api.md
@@ -79,7 +79,6 @@ export interface AmqpMessageProperties {
     replyToGroupId?: string;
     subject?: string;
     to?: string;
-    userId?: string;
 }
 
 // @public
diff --git a/sdk/core/core-amqp/src/messageProperties.ts b/sdk/core/core-amqp/src/messageProperties.ts
index 24784a6c088..7efa5f3bb2a 100644
--- a/sdk/core/core-amqp/src/messageProperties.ts
+++ b/sdk/core/core-amqp/src/messageProperties.ts
@@ -60,10 +60,10 @@ export interface AmqpMessageProperties {
    * content and purpose.
    */
   subject?: string;
-  /**
-   * @property {string} [userId] The identity of the user responsible for producing the message.
-   */
-  userId?: string;
+  // /**
+  //  * @property {string} [userId] The identity of the user responsible for producing the message.
+  //  */
+  // userId?: string;
 }
 
 /**
@@ -114,9 +114,9 @@ export const AmqpMessageProperties = {
     if (props.to != undefined) {
       amqpProperties.to = props.to;
     }
-    if (props.userId != undefined) {
-      amqpProperties.user_id = props.userId;
-    }
+    // if (props.userId != undefined) {
+    //   amqpProperties.user_id = props.userId;
+    // }
 
     logger.verbose("To RheaMessageProperties: %O", amqpProperties);
     return amqpProperties;
@@ -165,9 +165,9 @@ export const AmqpMessageProperties = {
     if (props.to != undefined) {
       msgProperties.to = props.to;
     }
-    if (props.user_id != undefined) {
-      msgProperties.userId = props.user_id;
-    }
+    // if (props.user_id != undefined) {
+    //   msgProperties.userId = props.user_id;
+    // }
 
     logger.verbose("From RheaMessageProperties: %O", msgProperties);
     return msgProperties;
diff --git a/sdk/core/core-amqp/test/message.spec.ts b/sdk/core/core-amqp/test/message.spec.ts
index 92c50804f42..54573d58790 100644
--- a/sdk/core/core-amqp/test/message.spec.ts
+++ b/sdk/core/core-amqp/test/message.spec.ts
@@ -89,8 +89,8 @@ describe("message", function() {
         replyTo: "",
         replyToGroupId: "",
         subject: "",
-        to: "",
-        userId: ""
+        to: ""
+        // userId: ""
       };
       const amqpMsgPropertiesExpected: RheaMessageProperties = {
         absolute_expiry_time: 0,
@@ -104,8 +104,8 @@ describe("message", function() {
         reply_to: "",
         reply_to_group_id: "",
         subject: "",
-        to: "",
-        user_id: ""
+        to: ""
+        // user_id: ""
       };
       const amqpMsgProperties: RheaMessageProperties = AmqpMessageProperties.toRheaMessageProperties(
         msgProperties
@@ -136,8 +136,8 @@ describe("message", function() {
         replyTo: "",
         replyToGroupId: "",
         subject: "",
-        to: "",
-        userId: ""
+        to: ""
+        // userId: ""
       };
       const amqpMsgProperties: RheaMessageProperties = {
         absolute_expiry_time: 0,
diff --git a/sdk/servicebus/service-bus/test/internal/serviceBusMessage.spec.ts b/sdk/servicebus/service-bus/test/internal/serviceBusMessage.spec.ts
index e653fe698d0..d061f4bc593 100644
--- a/sdk/servicebus/service-bus/test/internal/serviceBusMessage.spec.ts
+++ b/sdk/servicebus/service-bus/test/internal/serviceBusMessage.spec.ts
@@ -196,7 +196,7 @@ describe("ServiceBusMessageImpl AmqpAnnotations unit tests", () => {
       amqpMessage.group_sequence
     );
     assert.equal(sbMessage._amqpAnnotatedMessage.properties?.subject, amqpMessage.subject);
-    assert.equal(sbMessage._amqpAnnotatedMessage.properties?.userId, amqpMessage.user_id);
+    // assert.equal(sbMessage._amqpAnnotatedMessage.properties?.userId, amqpMessage.user_id);
 
     assert.equal(sbMessage._amqpAnnotatedMessage.properties?.messageId, sbMessage.messageId);
     assert.equal(sbMessage._amqpAnnotatedMessage.properties?.replyTo, sbMessage.replyTo);