diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index f6983d0340fc..6bd8931fc613 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -75,12 +75,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         StringBuilder hostBuilder = new StringBuilder();
         hostBuilder.append(getScheme());
         hostBuilder.append("://");
-        if (swagger.getHost() != null) {
+        if (!StringUtils.isEmpty(swagger.getHost())) {
             hostBuilder.append(swagger.getHost());
         } else {
             hostBuilder.append("localhost");
         }
-        if (swagger.getBasePath() != null) {
+        if (!StringUtils.isEmpty(swagger.getBasePath()) && !swagger.getBasePath().equals("/")) {
             hostBuilder.append(swagger.getBasePath());
         }
         return hostBuilder.toString();