diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php
index 58bdd41d2e5..8e0674642b2 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php
@@ -42,9 +42,14 @@ public function execute()
         try {
             $collection = $this->blockCollectionFactory->create();
             $blocks = $collection
-                ->addFieldToSelect(['title','is_active'])
-                ->addFieldToFilter('block_id', ['eq' => $params['block_id']])
-                ->load();
+                ->addFieldToSelect(['title', 'is_active'])
+                ->addFieldToFilter(
+                    ['block_id', 'identifier'],
+                    [
+                        ['eq' => $params['block_id']],
+                        ['eq' => $params['block_id']]
+                    ]
+                )->load();
             $result = $blocks->getFirstItem()->toArray();
         } catch (\Exception $e) {
             $result = [
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
index bc469c7a2cf..d3162293e6a 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
@@ -88,8 +88,13 @@ public function render(array $params): array
         $collection = $this->blockCollectionFactory->create();
         $blocks = $collection
             ->addFieldToSelect(['title', 'is_active'])
-            ->addFieldToFilter('block_id', ['eq' => $params['block_id']])
-            ->load();
+            ->addFieldToFilter(
+                ['block_id', 'identifier'],
+                [
+                    ['eq' => $params['block_id']],
+                    ['eq' => $params['block_id']]
+                ]
+            )->load();
 
         if ($blocks->count() === 0) {
             $result['error'] = sprintf(__('Block with ID: %s doesn\'t exist')->render(), $params['block_id']);