diff --git a/services/src/main/java/io/scalecube/services/Microservices.java b/services/src/main/java/io/scalecube/services/Microservices.java
index 36d73cc0d..c527ae799 100644
--- a/services/src/main/java/io/scalecube/services/Microservices.java
+++ b/services/src/main/java/io/scalecube/services/Microservices.java
@@ -213,8 +213,10 @@ private ServiceEndpoint newServiceEndpoint(ServiceEndpoint.Builder builder) {
 
     addresses.add(transportBootstrap.transportAddress);
 
-    for (String externalHost : externalHosts) {
-      addresses.add(Address.create(externalHost, transportBootstrap.transportAddress.port()));
+    if (externalHosts != null) {
+      for (String externalHost : externalHosts) {
+        addresses.add(Address.create(externalHost, transportBootstrap.transportAddress.port()));
+      }
     }
 
     return builder.addresses(addresses).build();