diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/SystemMaintainerWrite.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/SystemMaintainerWrite.php
index ecded37708ec723247ee74723e23b5f3aeca3fb7..ebfe02013c9969215edeec7c28f6148c1d7c33dc 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Ajax/SystemMaintainerWrite.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Ajax/SystemMaintainerWrite.php
@@ -45,6 +45,8 @@ class SystemMaintainerWrite extends AbstractAjaxAction
         }
 
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+        $queryBuilder->getRestrictions()->removeAll();
+
         $validatedUserList = $queryBuilder
             ->select('uid')
             ->from('be_users')
diff --git a/typo3/sysext/install/Classes/Updates/StartModuleUpdate.php b/typo3/sysext/install/Classes/Updates/StartModuleUpdate.php
index f270362558fe7dbfd9205722291eebd19a5b62e6..7f0f68820c0754ce829d6d44cc0ba579d0897afb 100644
--- a/typo3/sysext/install/Classes/Updates/StartModuleUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/StartModuleUpdate.php
@@ -35,9 +35,10 @@ class StartModuleUpdate extends AbstractUpdate
      */
     public function checkForUpdate(&$description)
     {
-        $statement = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getConnectionForTable('be_users')
-            ->select(['uid', 'uc'], 'be_users', []);
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+        $queryBuilder->getRestrictions()->removeAll();
+
+        $statement = $queryBuilder->select('uid', 'uc')->from('be_users')->execute();
         $needsExecution = false;
         while ($backendUser = $statement->fetch()) {
             if ($backendUser['uc'] !== null) {
@@ -69,6 +70,7 @@ class StartModuleUpdate extends AbstractUpdate
     public function performUpdate(array &$databaseQueries, &$customMessage)
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+        $queryBuilder->getRestrictions()->removeAll();
         $statement = $queryBuilder->select('uid', 'uc')->from('be_users')->execute();
         while ($backendUser = $statement->fetch()) {
             if ($backendUser['uc'] !== null) {
@@ -79,6 +81,7 @@ class StartModuleUpdate extends AbstractUpdate
                 ) {
                     $userConfig['startModule'] = 'help_AboutAbout';
                     $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+                    $queryBuilder->getRestrictions()->removeAll();
                     $queryBuilder->update('be_users')
                         ->where(
                             $queryBuilder->expr()->eq(