diff --git a/core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php b/core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php
index 8062f0a..d9cf07a 100644
--- a/core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php
+++ b/core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php
@@ -22,7 +22,7 @@ class PathProcessorFiles implements InboundPathProcessorInterface {
    * {@inheritdoc}
    */
   public function processInbound($path, Request $request) {
-    if (strpos($path, 'system/files/') === 0) {
+    if (strpos($path, 'system/files/') === 0 && !$request->query->has('file')) {
       $file_path = str_replace('system/files/', '', $path);
       $request->query->set('file', $file_path);
       return 'system/files';