diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
index 4ef5661fb6d16e664b7205582b1e5139e7c86381..2b5cb45811955fa23635482c89b65445015b6bfb 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
@@ -87,10 +87,6 @@ class DriverRegistry implements \TYPO3\CMS\Core\SingletonInterface
      */
     public function addDriversToTCA()
     {
-        // Add driver to TCA of sys_file_storage
-        if (TYPO3_MODE !== 'BE') {
-            return;
-        }
         $driverFieldConfig = &$GLOBALS['TCA']['sys_file_storage']['columns']['driver']['config'];
         $configurationFieldConfig = &$GLOBALS['TCA']['sys_file_storage']['columns']['configuration']['config'];
         foreach ($this->driverConfigurations as $driver) {
diff --git a/typo3/sysext/core/Configuration/TCA/Overrides/sys_file_storage.php b/typo3/sysext/core/Configuration/TCA/Overrides/sys_file_storage.php
new file mode 100644
index 0000000000000000000000000000000000000000..4404f3533fcff156cbfb46fbad7db228824f44aa
--- /dev/null
+++ b/typo3/sysext/core/Configuration/TCA/Overrides/sys_file_storage.php
@@ -0,0 +1,4 @@
+<?php
+defined('TYPO3_MODE') || die();
+
+\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\Driver\DriverRegistry::class)->addDriversToTCA();
diff --git a/typo3/sysext/core/ext_tables.php b/typo3/sysext/core/ext_tables.php
index 1a5fced4019b1cfade63d0e0604475868a374973..f1a9dc0d4e4b4c99d55b7cee7c092b91513ad6ad 100644
--- a/typo3/sysext/core/ext_tables.php
+++ b/typo3/sysext/core/ext_tables.php
@@ -40,10 +40,6 @@ $GLOBALS['PAGES_TYPES'] = array(
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('sys_category,sys_file_reference,sys_file_collection');
 
-/** @var \TYPO3\CMS\Core\Resource\Driver\DriverRegistry $registry */
-$registry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\Driver\DriverRegistry::class);
-$registry->addDriversToTCA();
-
 /**
  * $TBE_MODULES contains the structure of the backend modules as they are
  * arranged in main- and sub-modules. Every entry in this array represents a