diff --git a/promql_client/src/main/java/com/bdwise/prometheus/client/builder/InstantQueryBuilder.java b/promql_client/src/main/java/com/bdwise/prometheus/client/builder/InstantQueryBuilder.java
index 22b2e04..b900df8 100644
--- a/promql_client/src/main/java/com/bdwise/prometheus/client/builder/InstantQueryBuilder.java
+++ b/promql_client/src/main/java/com/bdwise/prometheus/client/builder/InstantQueryBuilder.java
@@ -1,6 +1,8 @@
 package com.bdwise.prometheus.client.builder;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,7 +25,11 @@ public class InstantQueryBuilder implements QueryBuilder {
 	}
 	
 	public InstantQueryBuilder withQuery(String query) {
-		params.put(QUERY_STRING, query);
+		try {
+			params.put(QUERY_STRING, URLEncoder.encode(query, "utf-8"));
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
 		return this;
 	}
 	
diff --git a/promql_client/src/main/java/com/bdwise/prometheus/client/builder/RangeQueryBuilder.java b/promql_client/src/main/java/com/bdwise/prometheus/client/builder/RangeQueryBuilder.java
index 6c1c829..9068cad 100644
--- a/promql_client/src/main/java/com/bdwise/prometheus/client/builder/RangeQueryBuilder.java
+++ b/promql_client/src/main/java/com/bdwise/prometheus/client/builder/RangeQueryBuilder.java
@@ -1,6 +1,8 @@
 package com.bdwise.prometheus.client.builder;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,7 +24,11 @@ public class RangeQueryBuilder implements QueryBuilder {
 	}
 	
 	public RangeQueryBuilder withQuery(String query) {
-		params.put(QUERY_STRING, query);
+		try {
+			params.put(QUERY_STRING, URLEncoder.encode(query, "utf-8"));
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
 		return this;
 	}
 	
diff --git a/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.class b/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.class
index ec59167..0f952c4 100644
Binary files a/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.class and b/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/DefaultQueryResult.class differ
diff --git a/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.class b/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.class
index 9879d6b..e147292 100644
Binary files a/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.class and b/promql_client/target/classes/com/bdwise/prometheus/client/converter/query/QueryResultItemValue.class differ