diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
index d04c712fd1c96..ec21cdd514493 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
@@ -527,8 +527,7 @@ public void AzureODataTests()
                     Top = 10,
                     OrderBy = "id"
                 };
-                var filterString = Uri.EscapeDataString("id gt 5 and name eq 'foo'");
-                Assert.Equal(string.Format("$filter={0}&$orderby=id&$top=10", filterString), filter.ToString());
+                Assert.Equal("$filter=id gt 5 and name eq 'foo'&$orderby=id&$top=10", filter.ToString());
                 client.Odata.GetWithFilter(filter);
             }
         }
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs
index 639023af44855..c651bbdc33621 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs
@@ -227,7 +227,6 @@ public void EncodingTheParameters()
         [Fact]
         public void ODataQuerySupportsAllParameters()
         {
-            var queryString = "foo eq 'bar'";
             var query = new ODataQuery<Param1>(p => p.Foo == "bar")
             {
                 Expand = "param1",
@@ -235,7 +234,7 @@ public void ODataQuerySupportsAllParameters()
                 Skip = 10,
                 Top = 100
             };
-            Assert.Equal(string.Format("$filter={0}&$orderby=d&$expand=param1&$top=100&$skip=10", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$orderby=d&$expand=param1&$top=100&$skip=10", query.ToString());
         }
 
         [Fact]
@@ -260,38 +259,34 @@ public void ODataQuerySupportsEmptyState()
         [Fact]
         public void ODataQuerySupportsPartialState()
         {
-            var queryString = "foo eq 'bar'";
             var query = new ODataQuery<Param1>(p => p.Foo == "bar")
             {
                 Top = 100
             };
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
         }
 
         [Fact]
         public void ODataQuerySupportsImplicitConversionFromFilterString()
         {
-            var queryString = "foo eq 'bar'";
-            ODataQuery<Param1> query = queryString;
+            ODataQuery<Param1> query = "foo eq 'bar'";
             query.Top = 100;
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
         }
 
         [Fact]
         public void ODataQuerySupportsImplicitConversionFromFullFilterString()
         {
-            var queryString = "foo eq 'bar'";
-            ODataQuery<Param1> query = string.Format("$filter={0}", queryString);
+            ODataQuery<Param1> query = "$filter=foo eq 'bar'";
             query.Top = 100;
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
         }
 
         [Fact]
         public void ODataQuerySupportsImplicitConversionFromQueryString()
         {
-            var queryString = "foo eq 'bar'";
-            ODataQuery<Param1> query = string.Format("$filter={0}&$top=100", queryString);
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            ODataQuery<Param1> query = "$filter=foo eq 'bar'&$top=100";
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
         }
 
         [Fact]
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs
index 99fed407ca114..252c7739db668 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs
@@ -146,17 +146,17 @@ public override string ToString()
             if (!string.IsNullOrEmpty(Filter))
             {
                 queryStringList.Add(string.Format(CultureInfo.InvariantCulture,
-                    "$filter={0}", Uri.EscapeDataString(Filter)));
+                    "$filter={0}", Filter));
             }
             if (!string.IsNullOrEmpty(OrderBy))
             {
                 queryStringList.Add(string.Format(CultureInfo.InvariantCulture,
-                    "$orderby={0}", Uri.EscapeDataString(OrderBy)));
+                    "$orderby={0}", OrderBy));
             }
             if (!string.IsNullOrEmpty(Expand))
             {
                 queryStringList.Add(string.Format(CultureInfo.InvariantCulture,
-                    "$expand={0}", Uri.EscapeDataString(Expand)));
+                    "$expand={0}", Expand));
             }
             if (Top != null)
             {