diff --git a/specification/quota/Quota.Management/CurrentQuotaLimitBase.tsp b/specification/quota/Quota.Management/CurrentQuotaLimitBase.tsp
index f2af0a081ba6..3b6cc5c7705c 100644
--- a/specification/quota/Quota.Management/CurrentQuotaLimitBase.tsp
+++ b/specification/quota/Quota.Management/CurrentQuotaLimitBase.tsp
@@ -23,6 +23,14 @@ model CurrentQuotaLimitBase
   >;
 }
 
+alias CurrentQuotaLimitBasesResponseHeaders = {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.
+   */
+  @header("ETag")
+  eTag: string;
+};
+
 #suppress "@azure-tools/typespec-azure-resource-manager/no-resource-delete-operation" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
 @armResourceOperations
 interface CurrentQuotaLimitBases {
@@ -32,13 +40,8 @@ interface CurrentQuotaLimitBases {
   get is Extension.Read<
     Extension.ScopeParameter,
     CurrentQuotaLimitBase,
-    Response = ArmResponse<CurrentQuotaLimitBase> & {
-      /**
-       * Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.
-       */
-      @header("ETag")
-      eTag: string;
-    },
+    Response = ArmResponse<CurrentQuotaLimitBase> &
+      CurrentQuotaLimitBasesResponseHeaders,
     Error = ExceptionResponse
   >;
 
@@ -78,13 +81,8 @@ interface CurrentQuotaLimitBases {
   list is Extension.ListByTarget<
     Extension.ScopeParameter,
     CurrentQuotaLimitBase,
-    Response = ArmResponse<QuotaLimits> & {
-      /**
-       * Current entity state version. Should be treated as opaque and used to make conditional HTTP requests.
-       */
-      @header("ETag")
-      eTag: string;
-    },
+    Response = ArmResponse<QuotaLimits> &
+      CurrentQuotaLimitBasesResponseHeaders,
     Error = ExceptionResponse
   >;
 }
diff --git a/specification/quota/Quota.Management/client.tsp b/specification/quota/Quota.Management/client.tsp
index fc653107c95d..6c13ad5d9e2a 100644
--- a/specification/quota/Quota.Management/client.tsp
+++ b/specification/quota/Quota.Management/client.tsp
@@ -62,3 +62,6 @@ using Microsoft.Quota;
 @@usage(SubmittedResourceRequestStatus, Usage.input, "csharp");
 
 @@clientName(Microsoft.Quota, "QuotaMgmtClient", "python");
+
+// Java-specific fixes for breaking changes
+@@clientName(CurrentQuotaLimitBasesResponseHeaders.eTag, "etag", "java");