diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java
index da8e0bcb5..88e9718e0 100644
--- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java
+++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java
@@ -19,8 +19,11 @@ package org.springframework.cloud.netflix.zuul.util;
 import static java.util.Arrays.stream;
 import static java.util.Collections.emptyMap;
 import static org.springframework.util.StringUtils.isEmpty;
+import static org.springframework.util.StringUtils.tokenizeToStringArray;
+import static org.springframework.util.StringUtils.uriDecode;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +39,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -78,12 +80,16 @@ public class RequestContentDataExtractor {
 					.collect(Collectors.toList());
 			List<String> listOfOnlyQueryParams = queryParamsGroupedByName.get(key);
 
-			if (listOfOnlyQueryParams != null
-					&& !listOfOnlyQueryParams.containsAll(listOfAllParams)) {
-				listOfAllParams.removeAll(listOfOnlyQueryParams);
-				for (String value : listOfAllParams) {
-					builder.add(key,
-							new HttpEntity<>(value, newHttpHeaders(request, key)));
+			if(listOfOnlyQueryParams != null) {
+				listOfOnlyQueryParams = listOfOnlyQueryParams.stream()
+						.map(param -> uriDecode(param, Charset.defaultCharset()))
+						.collect(Collectors.toList());
+				if (!listOfOnlyQueryParams.containsAll(listOfAllParams)) {
+					listOfAllParams.removeAll(listOfOnlyQueryParams);
+					for (String value : listOfAllParams) {
+						builder.add(key,
+								new HttpEntity<>(value, newHttpHeaders(request, key)));
+					}
 				}
 			}
 
@@ -127,7 +133,7 @@ public class RequestContentDataExtractor {
 		String query  = request.getQueryString();
 
 		if (query != null) {
-			for (String value : StringUtils.tokenizeToStringArray(query, "&")) {
+			for (String value : tokenizeToStringArray(query, "&")) {
 				if (value.contains("=")) {
 					value = value.substring(0, value.indexOf("="));
 				}
diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractorTest.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractorTest.java
index 24f7acf46..d7bc919c9 100644
--- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractorTest.java
+++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractorTest.java
@@ -74,6 +74,29 @@ public class RequestContentDataExtractorTest {
 		assertThat(result.get("uid"), hasItem(hasProperty("headers", notNullValue())));
 	}
 
+	@Test
+	public void methodExtractShouldReturnNotDuplicatedValuesFromRequestWhenEncoded()
+			throws Exception {
+		// when
+		when(request.getMultiFileMap()).thenReturn(new LinkedMultiValueMap<>());
+		when(request.getQueryString()).thenReturn("uid=hello%20world");
+
+		Map<String, String[]> expectedParameterMap = new HashMap<String, String[]>() {
+			{
+				put("uid", new String[] { "hello world" });
+			}
+		};
+		when(request.getParameterMap()).thenReturn(expectedParameterMap);
+
+		// action
+		MultiValueMap<String, Object> result = RequestContentDataExtractor
+				.extract(request);
+
+		// then
+		assertThat(result, notNullValue());
+		assertThat(result.size(), equalTo(0));
+	}
+
 	@Test
 	public void findQueryParamsGroupedByNameShouldReturnCorrectResult() {
 		// when