diff --git a/app/helpers/jsxc_helper.rb b/app/helpers/jsxc_helper.rb
index 168faf0ed..222763529 100644
--- a/app/helpers/jsxc_helper.rb
+++ b/app/helpers/jsxc_helper.rb
@@ -3,11 +3,10 @@ module JsxcHelper
     port = AppConfig.chat.server.bosh.port
     bind = AppConfig.chat.server.bosh.bind
     host = AppConfig.pod_uri.host
-    scheme = AppConfig.pod_uri.scheme
 
     unless AppConfig.chat.server.bosh.proxy?
       return "http://#{host}:#{port}#{bind}"
     end
-    return "#{scheme}://#{host}#{bind}"
+    AppConfig.url_to bind
   end
 end
diff --git a/spec/helpers/jsxc_helper_spec.rb b/spec/helpers/jsxc_helper_spec.rb
index 014e2f0b6..d38a72bc4 100644
--- a/spec/helpers/jsxc_helper_spec.rb
+++ b/spec/helpers/jsxc_helper_spec.rb
@@ -6,6 +6,7 @@ describe JsxcHelper, :type => :helper do
     AppConfig.chat.server.bosh.port = 1234
     AppConfig.chat.server.bosh.bind = '/bind'
     AppConfig.environment.url = "https://localhost/"
+    AppConfig.instance_variable_set(:@pod_uri, nil)
   end
 
   describe "#get_bosh_endpoint" do