UPSTREAM FIX

magento2-40480: Stops a failing database query for missing media files on filesystem storage

Community fix magento2-40480 merged into magento/magento2 on 2026-05-20, not in a release yet; applies cleanly to 34 releases from 2.4.6 to 2.4.9.

Stops a failing database query for missing media files on filesystem storage edited

Pull request title: SELECT from media_storage_file_storage when media DB storage is not in use or disabled
Pull request: magento/magento2#40480
Issues: #38116 human
Author: @hostep
Merged: 2026-05-20
Fixed in: no release yet
Reported on: —
Categories: —
Components: magento/module-media-storage

Labels

Area: Framework
Component: MediaStorage
Priority: P3
Severity: —
Reported on (labels): 2.4.x

Issue

Title and steps come from the upstream issue and pull request.

Description

1. The request triggers the queries to media_storage_file_storage table
2. Mysql service contains warning logs about accessing the table media_storage_file_storage that does not exists
3. Exceptions are not logged and silently suppressed in Magento\MediaStorage\Model\File\Storage\Synchronization::synchronize
4. Magento\MediaStorage\Model\File\Storage\Synchronization::synchronize does not uses disabled DB media storage

Steps to reproduce

1. Disable and never use DB media storage
2. Make sure the table media_storage_file_storage does not exists
![image](https://github.com/magento/magento2/assets/3192770/ebf7fc5d-1fcc-46c9-879f-1ebe597f895e)
3. Allow nginx to fallback to pub/get.php to resolve image
4. Access non existent image e.g. https://magento.local/media/wysiwyg/someImage.jpg

Expected result

1. The code execution does not trigger queries to media_storage_file_storage table
2. The user gets placeholder image without triggering media_storage_file_storage table
3. Mysql service does not contain warning logs about accessing the table media_storage_file_storage
4. Exceptions are logged in and not silently suppressed Magento\MediaStorage\Model\File\Storage\Synchronization::synchronize
5. Magento\MediaStorage\Model\File\Storage\Synchronization::synchronize does not use disabled DB media storage

Actual result

Taken from the upstream issue.

Error signatures

4. Exceptions are logged in and not silently suppressed `Magento\MediaStorage\Model\File\Storage\Synchronization::synchronize`
3. Exceptions are not logged and silently suppressed in `Magento\MediaStorage\Model\File\Storage\Synchronization::synchronize`
} catch (\Exception $e) {

Code match per tag

Each tag was checked with git apply --check against that tag's files. A clean match means the change applies; it is not a test result. Tags that already contain the fix are marked.

Line	Code match per tag	Tests
2.4.6	2.4.6 clean 2.4.6-p1 clean 2.4.6-p2 clean 2.4.6-p3 clean 2.4.6-p4 clean 2.4.6-p5 clean 2.4.6-p6 clean 2.4.6-p7 clean 2.4.6-p8 clean 2.4.6-p9 clean 2.4.6-p10 clean 2.4.6-p11 clean 2.4.6-p12 clean 2.4.6-p13 clean 2.4.6-p14 clean 2.4.6-p15 clean	2.4.6: no test data 2.4.6-p1: no test data 2.4.6-p2: no test data 2.4.6-p3: no test data 2.4.6-p4: no test data 2.4.6-p5: no test data 2.4.6-p6: no test data 2.4.6-p7: no test data 2.4.6-p8: no test data 2.4.6-p9: no test data 2.4.6-p10: no test data 2.4.6-p11: no test data 2.4.6-p12: no test data 2.4.6-p13: no test data 2.4.6-p14: no test data 2.4.6-p15: no test data
2.4.7	2.4.7 clean 2.4.7-p1 clean 2.4.7-p2 clean 2.4.7-p3 clean 2.4.7-p4 clean 2.4.7-p5 clean 2.4.7-p6 clean 2.4.7-p7 clean 2.4.7-p8 clean 2.4.7-p9 clean 2.4.7-p10 clean	2.4.7: no test data 2.4.7-p1: no test data 2.4.7-p2: no test data 2.4.7-p3: no test data 2.4.7-p4: no test data 2.4.7-p5: no test data 2.4.7-p6: no test data 2.4.7-p7: no test data 2.4.7-p8: no test data 2.4.7-p9: no test data 2.4.7-p10: test files do not apply to this releaseunit: could not run before, could not run after
2.4.8	2.4.8 clean 2.4.8-p1 clean 2.4.8-p2 clean 2.4.8-p3 clean 2.4.8-p4 clean 2.4.8-p5 clean	2.4.8: no test data 2.4.8-p1: no test data 2.4.8-p2: no test data 2.4.8-p3: no test data 2.4.8-p4: no test data 2.4.8-p5: test files do not apply to this releaseunit: could not run before, could not run after
2.4.9	2.4.9 clean	2.4.9: fails before, passes afterunit: fails before, passes after

Triage

Model @cf/cloudflare/clef. Probability this is a bug fix: 96.1%. Probability it is security relevant: 0.6%.

Show the model's answers and probabilities

Question	Answer	Probabilities	Confidence
Change kind	bugfix	bugfix 94.7%, refactor 2.9%, tests_only 0.9%, feature 0.8%, dependency 0.4%, docs_only 0.4%	87.8%
Area	other	other 38.6%, framework 33.8%, frontend 13.2%	18.4%
Reported version	unspecified	unspecified 49.5%, 2.4.6 1.5%, 2.4.9 1.4%	24.0%
Scope	0.76 of 2	1 44.7%, 0 39.7%, 2 15.6%	7.3%
Risk	0.25 of 2	0 78.6%, 1 18.2%, 2 3.2%	47.7%
Worth backporting	1.29 of 2	2 49.4%, 1 30.7%, 0 19.9%	6.7%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-40480/ folder into patches/composer/, merge composer.patches.json into composer.json, then run composer install. Test files are always removed; paths are relative to each package root, using the default -p1 level.

Bundle README (what the ZIP ships)

# magento2-40480

Community fix merged upstream into magento/magento2, adapted by magento.watch.
This is not a patch published by Adobe.

Pull request: https://github.com/magento/magento2/pull/40480
Issue: https://github.com/magento/magento2/issues/38116
Author: @hostep
Source commit: f49f49a7b7935200629ed1a6d6b3312a80715b5e
Modifications: test files and documentation removed, paths rewritten relative to each Composer package.
Licence: OSL-3.0 / AFL-3.0, as the original Magento Open Source code.
Maintainer: Łukasz Bajsarowicz (@lbajsarowicz)

Licence: Magento Open Source code under OSL-3.0 and AFL-3.0. The bundle carries the original author, source commit and the list of modifications.