diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java
index 5aa88da8a3..66d5231edc 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java
@@ -398,7 +398,7 @@ public abstract class Aws4SignerBase {
 
       // CanonicalQueryString + '\n' +
       if (endpoint.getQuery() != null) {
-         canonicalRequest.append(getCanonicalizedQueryString(endpoint.getQuery()));
+         canonicalRequest.append(getCanonicalizedQueryString(endpoint.getRawQuery()));
       }
       canonicalRequest.append("\n");