diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java
index d61db3ffd1..8202ab2359 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV2.java
@@ -253,7 +253,7 @@ void appendUriPath(HttpRequest request, StringBuilder toSign) {
       // ...however, there are a few exceptions that must be included in the
       // signed URI.
       if (request.getEndpoint().getQuery() != null) {
-         Multimap<String, String> params = queryParser().apply(request.getEndpoint().getQuery());
+         Multimap<String, String> params = queryParser().apply(request.getEndpoint().getRawQuery());
          char separator = '?';
          for (String paramName : Ordering.natural().sortedCopy(params.keySet())) {
             // Skip any parameters that aren't part of the canonical signed string