core/lib/Drupal/Core/Asset/AssetResolver.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php
index 68418c9..c41e14e 100644
--- a/core/lib/Drupal/Core/Asset/AssetResolver.php
+++ b/core/lib/Drupal/Core/Asset/AssetResolver.php
@@ -285,6 +285,12 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
       }
     }
 
+    if ($optimize) {
+      $collection_optimizer = \Drupal::service('asset.js.collection_optimizer');
+      $js_assets_header = $collection_optimizer->optimize($js_assets_header);
+      $js_assets_footer = $collection_optimizer->optimize($js_assets_footer);
+    }
+
     // If the core/drupalSettings library is being loaded or is already loaded,
     // get the JavaScript settings assets, and convert them into a single
     // "regular" JavaScript asset.
@@ -314,12 +320,6 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
       }
     }
 
-    if ($optimize) {
-      $collection_optimizer = \Drupal::service('asset.js.collection_optimizer');
-      $js_assets_header = $collection_optimizer->optimize($js_assets_header);
-      $js_assets_footer = $collection_optimizer->optimize($js_assets_footer);
-    }
-
     return [
       $js_assets_header,
       $js_assets_footer,