diff --git a/app/steps/resolveProxyHost.js b/app/steps/resolveProxyHost.js
index 181dda7a..fe2aedae 100644
--- a/app/steps/resolveProxyHost.js
+++ b/app/steps/resolveProxyHost.js
@@ -1,19 +1,19 @@
 'use strict';
 var requestOptions = require('../../lib/requestOptions');
 
-function resolveProxyHost(container) {
+async function resolveProxyHost(container) {
   var parsedHost;
 
   if (container.options.memoizeHost && container.options.memoizedHost) {
     parsedHost = container.options.memoizedHost;
   } else {
-    parsedHost = requestOptions.parseHost(container);
+    parsedHost = await requestOptions.parseHost(container);
   }
 
   container.proxy.reqBuilder.host = parsedHost.host;
   container.proxy.reqBuilder.port = container.options.port || parsedHost.port;
   container.proxy.requestModule = parsedHost.module;
-  return Promise.resolve(container);
+  return container;
 }
 
 module.exports = resolveProxyHost;
diff --git a/lib/requestOptions.js b/lib/requestOptions.js
index 59b8af60..a5deff26 100644
--- a/lib/requestOptions.js
+++ b/lib/requestOptions.js
@@ -20,11 +20,11 @@ function extend(obj, source, skips) {
   return obj;
 }
 
-function parseHost(Container) {
+async function parseHost(Container) {
   var host = Container.params.host;
   var req =  Container.user.req;
   var options = Container.options;
-  host = (typeof host === 'function') ? host(req) : host.toString();
+  host = (typeof host === 'function') ? (await host(req)) : host.toString();
 
   if (!host) {
     return new Error('Empty host parameter');