diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp
index 0fe39f42edf22ee165cfb4cd472579dab117882f..c31f054aaacd31f860c40bb7c0797247a12e77c5 100644
--- a/dbms/src/Server/Server.cpp
+++ b/dbms/src/Server/Server.cpp
@@ -313,12 +313,12 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
         std::vector<std::string> listen_hosts = DB::getMultipleValuesFromConfig(config(), "", "listen_host");
 
-        bool try_listen = false;
+        bool listen_try = config().getUInt("listen_try", false);
         if (listen_hosts.empty())
         {
             listen_hosts.emplace_back("::1");
             listen_hosts.emplace_back("127.0.0.1");
-            try_listen = true;
+            listen_try = true;
         }
 
         auto make_socket_address = [&](const std::string & host, UInt16 port)
@@ -452,7 +452,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
             }
             catch (const Poco::Net::NetException & e)
             {
-                if (try_listen && (e.code() == POCO_EPROTONOSUPPORT || e.code() == POCO_EADDRNOTAVAIL))
+                if (listen_try && (e.code() == POCO_EPROTONOSUPPORT || e.code() == POCO_EADDRNOTAVAIL))
                     LOG_ERROR(log, "Listen [" << listen_host << "]: " << e.what() << ": " << e.message()
                         << "  If it is an IPv6 or IPv4 address and your host has disabled IPv6 or IPv4, then consider to "
                         "specify not disabled IPv4 or IPv6 address to listen in <listen_host> element of configuration "
diff --git a/dbms/src/Server/config.xml b/dbms/src/Server/config.xml
index 62936425cbd6458b89b99b34361ecd8369b11bfc..ca75025ac7b04a61a4a66e310cb52a3a5ad21ec9 100644
--- a/dbms/src/Server/config.xml
+++ b/dbms/src/Server/config.xml
@@ -72,6 +72,8 @@
     <listen_host>::1</listen_host>
     <listen_host>127.0.0.1</listen_host>
     -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!-- <listen_try>0</listen_try> -->
 
     <max_connections>4096</max_connections>
     <keep_alive_timeout>3</keep_alive_timeout>
diff --git a/dbms/tests/server-test.xml b/dbms/tests/server-test.xml
index e37bda9d0a795698fbf2b2697576ac616b38e643..9d3baa5258faf2fe0711ca6149a542d318e237e8 100644
--- a/dbms/tests/server-test.xml
+++ b/dbms/tests/server-test.xml
@@ -8,6 +8,9 @@
         <size>10M</size>
         <count>1</count>
     </logger>
+    <listen_host>0.0.0.0</listen_host>
+    <listen_host>::</listen_host>
+    <listen_try>1</listen_try>
     <http_port>58123</http_port>
     <tcp_port>59000</tcp_port>
     <interserver_http_port>59009</interserver_http_port>
diff --git a/docker/builder/Makefile b/docker/builder/Makefile
index b02d86373f2f86494744d2a819ee455790885edc..4a6df269e9ef014eef5dd9f27c324f351066cfae 100644
--- a/docker/builder/Makefile
+++ b/docker/builder/Makefile
@@ -8,4 +8,4 @@ image:
 	docker build -t yandex/clickhouse-builder .
 
 image_push:
-	docker push yandex/clickhouse-builder
\ No newline at end of file
+	docker push yandex/clickhouse-builder
diff --git a/docker/server/docker_related_config.xml b/docker/server/docker_related_config.xml
index 7171a8b5ff72c081e98c7f1f84d719dd4ee6c763..ab6f82ad4c4be43276bcf67bb3a3625070d90aba 100644
--- a/docker/server/docker_related_config.xml
+++ b/docker/server/docker_related_config.xml
@@ -1,4 +1,6 @@
 <yandex>
      <!-- Listen wildcard address to allow accepting connections from other containers and host network. -->
     <listen_host>0.0.0.0</listen_host>
+    <listen_host>::</listen_host>
+    <listen_try>1</listen_try>
 </yandex>