diff --git a/AutoRest/Modelers/CompositeSwagger/CompositeSwaggerModeler.cs b/AutoRest/Modelers/CompositeSwagger/CompositeSwaggerModeler.cs
index 6b94681f2a..8ebeb22e8f 100644
--- a/AutoRest/Modelers/CompositeSwagger/CompositeSwaggerModeler.cs
+++ b/AutoRest/Modelers/CompositeSwagger/CompositeSwaggerModeler.cs
@@ -219,6 +219,16 @@ private static ServiceClient Merge(ServiceClient compositeClient, ServiceClient
                     && m.Group == subClientMethod.Group);
                 if (compositeClientMethod == null)
                 {
+                    // Re-link client parameters
+                    foreach (var parameter in subClientMethod.Parameters.Where(p => p.ClientProperty != null))
+                    {
+                        var clientProperty = compositeClient.Properties
+                            .FirstOrDefault(p => p.SerializedName == parameter.ClientProperty.SerializedName);
+                        if (clientProperty != null)
+                        {
+                            parameter.ClientProperty = clientProperty;
+                        }
+                    }
                     compositeClient.Methods.Add(subClientMethod);
                 }
             }