diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bd0871b9..fc9e3608a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `RESOLVER` ENV variable overrides all other nameservers detected from `/etc/resolv.conf` [PR #260](https://github.com/3scale/apicast/pull/260)
 - Use stale DNS cache when there is a query in progress for that record [PR #260](https://github.com/3scale/apicast/pull/260)
 - Bump s2i-openresty to 1.11.2.2-2 [PR #260](https://github.com/3scale/apicast/pull/260)
+- Echo API on port 8081 listens accepts any Host [PR #268](https://github.com/3scale/apicast/pull/268)
 
 ### Added
 
diff --git a/apicast/conf/nginx.conf b/apicast/conf/nginx.conf
index 6eb9c045f..f6a169722 100644
--- a/apicast/conf/nginx.conf
+++ b/apicast/conf/nginx.conf
@@ -80,9 +80,9 @@ http {
   }
 
   server {
-    listen 8081;
+    listen 8081 default_server;
 
-    server_name echo;
+    server_name echo _;
 
     include ../conf.d/echo.conf;
   }