diff --git a/Dockerfile b/Dockerfile
index 4dcba28..0a6382b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 
 COPY ./ ./
 
-RUN go build -v -ldflags="-X 'main.version=v1.0.17'" helmet.go
+RUN go build -v -ldflags="-X 'main.version=v1.0.18'" helmet.go
 
 FROM golang:1.16.6
 
diff --git a/README.md b/README.md
index d2d9470..035ab27 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="/assets/logo.png?v=1.0.17" width="200" />
+    <img src="/assets/logo.png?v=1.0.18" width="200" />
     <h3 align="center">Helmet</h3>
     <p align="center">A Lightweight Cloud Native API Gateway.</p>
     <p align="center">
@@ -10,10 +10,10 @@
             <img src="https://github.com/spacewalkio/Helmet/workflows/Release/badge.svg">
         </a>
         <a href="https://github.com/spacewalkio/Helmet/releases">
-            <img src="https://img.shields.io/badge/Version-1.0.17-9B59B6.svg">
+            <img src="https://img.shields.io/badge/Version-1.0.18-9B59B6.svg">
         </a>
         <a href="https://goreportcard.com/report/github.com/spacewalkio/Helmet">
-            <img src="https://goreportcard.com/badge/github.com/spacewalkio/Helmet?v=1.0.17">
+            <img src="https://goreportcard.com/badge/github.com/spacewalkio/Helmet?v=1.0.18">
         </a>
         <a href="https://godoc.org/github.com/spacewalkio/helmet">
             <img src="https://godoc.org/github.com/spacewalkio/helmet?status.svg">
@@ -25,7 +25,7 @@
 </p>
 <br/>
 <p align="center">
-    <img src="/assets/chart.png?v=1.0.17" width="80%" />
+    <img src="/assets/chart.png?v=1.0.18" width="80%" />
 </p>
 
 Helmet is Cloud Native API Gateway that control who accesses your API whether from customer or other internal services. It also collect metrics about service calls count, latency, success rate and much more!
diff --git a/core/controller/global_context.go b/core/controller/global_context.go
index cfbb778..cb8b538 100644
--- a/core/controller/global_context.go
+++ b/core/controller/global_context.go
@@ -62,7 +62,7 @@ func (c *GlobalContext) GetBalancer() (map[string]component.Balancer, error) {
 			}
 		}
 
-		if endpoint.Proxy.Upstreams.Balancing == "random" {
+		if endpoint.Proxy.Upstreams.Balancing == "random" || endpoint.Proxy.Upstreams.Balancing == "none" {
 			result[endpoint.Name] = component.NewRandomBalancer([]*component.Target{})
 
 			for _, target := range endpoint.Proxy.Upstreams.Targets {