diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
index 774890d..505851d 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
@@ -154,7 +154,8 @@ public function addBreakpointFromMediaQuery($name, $media_query) {
       $breakpoint = entity_create('breakpoint', array(
         'name' => $name,
         'label' => $name,
-        'mediaQuery' => $media_query,
+        'mediaQuery' => $media_query['mediaQuery'],
+        'uuid' => $media_query['uuid'],
         'source' => $this->name,
         'sourceType' => $this->sourceType,
         'weight' => count($this->breakpoints),
diff --git a/core/modules/toolbar/config/toolbar.breakpoints.yml b/core/modules/toolbar/config/toolbar.breakpoints.yml
index 74b318e..722f948 100644
--- a/core/modules/toolbar/config/toolbar.breakpoints.yml
+++ b/core/modules/toolbar/config/toolbar.breakpoints.yml
@@ -1,3 +1,9 @@
-narrow: 'only screen and (min-width: 16.5em)'
-standard: 'only screen and (min-width: 38.125em)'
-wide: 'only screen and (min-width: 52em)'
+narrow:
+  mediaQuery: 'only screen and (min-width: 16.5em)'
+  uuid: 1dc073e1-9dcf-4c1b-9b06-6ed3c3c914e5
+standard:
+  mediaQuery: 'only screen and (min-width: 38.125em)'
+  uuid: dbf3db8a-987c-44fd-9e00-b3f6c10e236a
+wide:
+  mediaQuery: 'only screen and (min-width: 52em)'
+  uuid: f8c439a1-909f-444e-9543-67bbf11cafa1