diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 8a50783..788378c 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -177,13 +177,17 @@ function toolbar_pre_render($element) {
   // toolbar presentation.
   $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('toolbar');
   if (!empty($breakpoints)) {
-    $media_queries = array();
+    $media_queries =  array();
     foreach ($breakpoints as $id => $breakpoint) {
-      $media_queries['toolbar']['breakpoints'][$id] = $breakpoint['mediaQuery'];
+      $media_queries[$id] = $breakpoint->getMediaQuery();
     }
 
     $element['#attached']['js'][] = array(
-      'data' => $media_queries,
+      'data' => array(
+        'toolbar' => array(
+          'breakpoints' => $media_queries,
+        )
+      ),
       'type' => 'setting',
     );
   }