diff --git a/typo3/sysext/extbase/Configuration/Services.yaml b/typo3/sysext/extbase/Configuration/Services.yaml
index d0c5dfda66bc86bb9ed68ad9261fc82114d16a82..2e592c50e129a974842460020ab08aa1177498e0 100644
--- a/typo3/sysext/extbase/Configuration/Services.yaml
+++ b/typo3/sysext/extbase/Configuration/Services.yaml
@@ -35,6 +35,11 @@ services:
   TYPO3\CMS\Extbase\Persistence\Generic\QueryResult: ~
   TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings: ~
 
+  TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper:
+    shared: false
+    arguments:
+      $query: null
+
   cache.extbase:
     class: TYPO3\CMS\Core\Cache\Frontend\FrontendInterface
     factory: ['@TYPO3\CMS\Core\Cache\CacheManager', 'getCache']