diff --git a/lib/airrecord/client.rb b/lib/airrecord/client.rb
index 12bc864..23c70f3 100644
--- a/lib/airrecord/client.rb
+++ b/lib/airrecord/client.rb
@@ -1,4 +1,5 @@
 require_relative 'faraday_rate_limiter'
+require 'erb'
 
 module Airrecord
   class Client
@@ -28,8 +29,8 @@ def connection
       end
     end
 
-    def escape(*args)
-      CGI.escape(*args)
+    def escape(*args) 
+      ERB::Util.url_encode(*args)
     end
 
     def parse(body)