diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
index 338d04088f..a22ec619fe 100755
--- a/incubator/kafka/Chart.yaml
+++ b/incubator/kafka/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Apache Kafka is publish-subscribe messaging rethought as a distributed
   commit log.
 name: kafka
-version: 0.13.6
+version: 0.13.7
 appVersion: 5.0.1
 keywords:
 - kafka
diff --git a/incubator/kafka/templates/service-brokers-external.yaml b/incubator/kafka/templates/service-brokers-external.yaml
index 81880fac6f..a0813b211e 100644
--- a/incubator/kafka/templates/service-brokers-external.yaml
+++ b/incubator/kafka/templates/service-brokers-external.yaml
@@ -8,7 +8,8 @@
     {{- $externalListenerPort := add $root.Values.external.firstListenerPort $i }}
     {{- $responsiblePod := printf "%s-%d" (printf "%s" $fullName) $i }}
     {{- $distinctPrefix := printf "%s-%d" $dnsPrefix $i }}
-    {{- $loadBalancerIP := index $root.Values.external.loadBalancerIP $i }}
+    {{- $loadBalancerIPLen := len $root.Values.external.loadBalancerIP }}
+
 ---
 apiVersion: v1
 kind: Service
@@ -53,8 +54,8 @@ spec:
       nodePort: {{ $externalListenerPort }}
       {{- end }}
       protocol: TCP
-  {{- if eq $root.Values.external.type "LoadBalancer" }}
-  loadBalancerIP: {{ $loadBalancerIP }}
+  {{- if and (eq $root.Values.external.type "LoadBalancer") (eq $loadBalancerIPLen $replicas) }}
+  loadBalancerIP: {{ index $root.Values.external.loadBalancerIP $i }} 
   {{- end }}
   selector:
     app: {{ include "kafka.name" $root }}