diff --git a/table/lib/azure/storage/table/table_service.rb b/table/lib/azure/storage/table/table_service.rb
index 6357b645..bd26160f 100644
--- a/table/lib/azure/storage/table/table_service.rb
+++ b/table/lib/azure/storage/table/table_service.rb
@@ -741,14 +741,8 @@ def encodeODataUriValues(values)
 
       protected
         def encodeODataUriValue(value)
-          # Replace each single quote (') with double single quotes ('') not double
-          # quotes (")
-          value = value.gsub("'", "''")
-
           # Encode the special URL characters
-          value = URI.escape(value)
-
-          value
+          CGI.escape(value)
         end
 
       protected