diff --git a/src/main/archetype/dispatcher.cloud/src/conf.d/dispatcher_vhost.conf b/src/main/archetype/dispatcher.cloud/src/conf.d/dispatcher_vhost.conf
index e632cbe7a..11aaa2cf5 100644
--- a/src/main/archetype/dispatcher.cloud/src/conf.d/dispatcher_vhost.conf
+++ b/src/main/archetype/dispatcher.cloud/src/conf.d/dispatcher_vhost.conf
@@ -103,8 +103,12 @@ Alias "/system/probes/start" probes/startup-status.json
 
 # SITES-11040 Do ProxyPassMatch, if caching for GraphQL Persisted Queries is not enabled
 <IfDefine !CACHE_GRAPHQL_PERSISTED_QUERIES>
+	# SITES-40408 Skip rewrite rules for /graphql/execute.json
+	RewriteCond %{THE_REQUEST} \s/graphql/execute\.json/ [NC]
+	RewriteRule ^ - [END]
     # SITES-3659 Prevent re-encodes of URLs sent to GraphQL Persisted Queries API endpoint
-	<LocationMatch "/graphql/execute.json/.*">
+	<LocationMatch "^/graphql/execute\.json/.*">
+        RewriteEngine Off
         ProxyPassMatch http://${AEM_HOST}:${AEM_PORT} nocanon
 	</LocationMatch>
 </IfDefine>