From e296078892924a29244c0d55266a20a3e5c6fb30 Mon Sep 17 00:00:00 2001
From: Rick Bouma <r.bouma@disrex.nl>
Date: Fri, 13 Jun 2025 23:30:13 +0200
Subject: [PATCH] Fix DynamicStorage entity_type filtering to prevent
 CMS/product ID collision (#39996)

---
 .../Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
index 9c0da586302af..d1840b36001a9 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
@@ -165,6 +165,7 @@ private function findProductRewriteByRequestPath(array $data): ?array
 
         $productUrl = $this->getBaseName($requestPath);
         $data[UrlRewrite::REQUEST_PATH] = [$productUrl];
+        $data[UrlRewrite::ENTITY_TYPE] = 'product';
 
         $productFromDb = $this->connection->fetchRow($this->prepareSelect($data));
         if ($productFromDb === false) {