diff --git src/wp-includes/load.php src/wp-includes/load.php
index c785128..7623de8 100644
--- src/wp-includes/load.php
+++ src/wp-includes/load.php
@@ -88,7 +88,7 @@ function wp_fix_server_vars() {
 			}
 
 			// Append the query string if it exists and isn't null
-			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
+			if ( ! empty( $_SERVER['QUERY_STRING'] ) && ! parse_url( $_SERVER['REQUEST_URI'], PHP_URL_QUERY ) ) {
 				$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
 			}
 		}