diff --git a/src/Exporter.php b/src/Exporter.php
index 6413ea9..0b6cf59 100644
--- a/src/Exporter.php
+++ b/src/Exporter.php
@@ -572,6 +572,7 @@ class Exporter {
     $event = new PreSerializeEvent($entity, $this->mode);
     $this->eventDispatcher->dispatch($event);
     $entity = $event->getEntity();
+    $this->processLayoutBuilderComponents($entity);
 
     if ($entity) {
       if (PHP_SAPI === 'cli') {
@@ -592,6 +593,36 @@ class Exporter {
     return $content;
   }
 
+  /**
+   * Replaces blocks revision IDs with UUIDs in layout builder configuration.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   */
+  protected function processLayoutBuilderComponents($entity) {
+    if (!$entity->hasField('layout_builder__layout')) {
+      return;
+    }
+
+    /** @var \Drupal\layout_builder\Field\LayoutSectionItemList $layout_builder__layout */
+    $layout = $entity->get('layout_builder__layout');
+    /** @var \Drupal\layout_builder\Plugin\Field\FieldType\LayoutSectionItem $section */
+    foreach ($layout as $section) {
+      $components = $section->get('section')->getValue()->getComponents();
+      /** @var SectionComponent $component */
+      foreach ($components as $component) {
+        $configuration = $component->get('configuration');
+        if (substr($configuration['id'], 0, 13) === 'inline_block:' && !empty($configuration['block_revision_id'])) {
+          $block_revision = \Drupal::entityTypeManager()
+            ->getStorage('block_content')
+            ->loadRevision($configuration['block_revision_id']);
+          unset($configuration['block_revision_id']);
+          $configuration['block_uuid'] = $block_revision->uuid();
+        }
+        $component->setConfiguration($configuration);
+      }
+    }
+  }
+
   /**
    * Exports a single entity and all its referenced entity.
    *
diff --git a/src/Importer.php b/src/Importer.php
index cdc5e20..259959d 100644
--- a/src/Importer.php
+++ b/src/Importer.php
@@ -303,6 +303,7 @@ class Importer {
           /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
           $entity = $this->serializer->denormalize($file['data'], $class, 'hal_json', ['request_method' => 'POST']);
           $entity->enforceIsNew($file['is_new']);
+          $this->processLayoutBuilderComponents($entity);
           $entity->save();
           $this->entityIdLookup[$uuid] = $entity->id();
 
@@ -352,6 +353,43 @@ class Importer {
     }
   }
 
+  /**
+   * Replaces blocks revision IDs with UUIDs in layout builder configuration.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   */
+  protected function processLayoutBuilderComponents($entity) {
+    if (!$entity->hasField('layout_builder__layout')) {
+      return;
+    }
+
+    /** @var \Drupal\layout_builder\Field\LayoutSectionItemList $layout_builder__layout */
+    $layout = $entity->get('layout_builder__layout');
+    /** @var \Drupal\layout_builder\Plugin\Field\FieldType\LayoutSectionItem $section */
+    foreach ($layout as $section) {
+      $components = $section->get('section')->getValue()->getComponents();
+      /** @var \Drupal\layout_builder\SectionComponent $component */
+      foreach ($components as $component) {
+        $configuration = $component->get('configuration');
+        if (substr($configuration['id'], 0, 13) === 'inline_block:' && !empty($configuration['block_uuid'])) {
+          $blocks = \Drupal::entityTypeManager()
+            ->getStorage('block_content')
+            ->loadByProperties(['uuid' => $configuration['block_uuid']]);
+          unset($configuration['block_uuid']);
+          if ($blocks) {
+            /** @var \Drupal\block_content\Entity\BlockContent $block */
+            $block = reset($blocks);
+            $configuration['block_revision_id'] = $block->getRevisionId();
+          }
+          else {
+            $configuration['block_revision_id'] = 0;
+          }
+        }
+        $component->setConfiguration($configuration);
+      }
+    }
+  }
+
   /**
    * Gets url from file for set to Link manager.
    *