diff --git a/commerce_braintree.module b/commerce_braintree.module
index a0c46dd..8744b94 100644
--- a/commerce_braintree.module
+++ b/commerce_braintree.module
@@ -387,6 +387,11 @@ function commerce_braintree_get_feedback() {
   $feedback = FALSE;
   if (isset($_SERVER['QUERY_STRING'])) {
     $feedback = $_SERVER['QUERY_STRING'];
+    
+    if (variable_get('clean_url', FALSE)) {
+      // if clean URLs enabled, remove "q" parameter from query string
+      $feedback = preg_replace("/&q(=[^&]*)?|^q(=[^&]*)?&?/", "", $feedback);
+    }
   }
   return $feedback;
 }