diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
index d9e9705ac039d..8d1d7760e794e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
@@ -178,17 +178,17 @@ private function findProductRewriteByRequestPath(array $data): ?array
             $data[UrlRewrite::REQUEST_PATH] = [$categoryPath . $categorySuffix];
             unset($data[UrlRewrite::IS_AUTOGENERATED]);
             $categoryFromDb = $this->connection->fetchRow($this->prepareSelect($data));
+            
+            if ($categoryFromDb === false) {
+                return null;
+            }
 
             if ($categoryFromDb[UrlRewrite::REDIRECT_TYPE]) {
                 $productFromDb[UrlRewrite::REDIRECT_TYPE] = OptionProvider::PERMANENT;
                 $categoryPath = str_replace($categorySuffix, '', $categoryFromDb[UrlRewrite::TARGET_PATH]);
             }
 
-            if ($categoryFromDb === false
-                || !$productResource->canBeShowInCategory(
-                    $productFromDb[UrlRewrite::ENTITY_ID],
-                    $categoryFromDb[UrlRewrite::ENTITY_ID]
-                )
+            if (!$productResource->canBeShowInCategory($productFromDb[UrlRewrite::ENTITY_ID], $categoryFromDb[UrlRewrite::ENTITY_ID])
             ) {
                 return null;
             }