diff --git a/Classes/Domain/Index/TcaIndexer/TcaTableService.php b/Classes/Domain/Index/TcaIndexer/TcaTableService.php
index 21e6374..65adf70 100644
--- a/Classes/Domain/Index/TcaIndexer/TcaTableService.php
+++ b/Classes/Domain/Index/TcaIndexer/TcaTableService.php
@@ -142,15 +142,7 @@ class TcaTableService
      */
     public function getWhereClause()
     {
-        $whereClause = '1=1'
-            . BackendUtility::BEenableFields($this->tableName)
-            . BackendUtility::deleteClause($this->tableName)
-
-            . BackendUtility::BEenableFields('pages')
-            . BackendUtility::deleteClause('pages')
-            . ' AND pages.no_search = 0'
-            ;
-
+        $whereClause = $this->getSystemWhereClause();
         $userDefinedWhere = $this->configuration->getIfExists('indexing.' . $this->getTableName() . '.additionalWhereClause');
         if (is_string($userDefinedWhere)) {
             $whereClause .= ' AND ' . $userDefinedWhere;
@@ -169,6 +161,22 @@ class TcaTableService
         return $whereClause;
     }
 
+    /**
+     * Generate SQL for TYPO3 as a system, to make sure only available records
+     * are fetched.
+     */
+    public function getSystemWhereClause() : string
+    {
+        return '1=1'
+            . BackendUtility::BEenableFields($this->tableName)
+            . BackendUtility::deleteClause($this->tableName)
+
+            . BackendUtility::BEenableFields('pages')
+            . BackendUtility::deleteClause('pages')
+            . ' AND pages.no_search = 0'
+            ;
+    }
+
     /**
      * @return string
      */
diff --git a/Tests/Unit/Domain/Index/TcaIndexer/TcaTableServiceTest.php b/Tests/Unit/Domain/Index/TcaIndexer/TcaTableServiceTest.php
index 9e88d4b..330c16e 100644
--- a/Tests/Unit/Domain/Index/TcaIndexer/TcaTableServiceTest.php
+++ b/Tests/Unit/Domain/Index/TcaIndexer/TcaTableServiceTest.php
@@ -60,6 +60,9 @@ class TcaTableServiceTest extends AbstractUnitTestCase
             ->method('getIfExists')
             ->withConsecutive(['indexing.table.additionalWhereClause'], ['indexing.table.rootLineBlacklist'])
             ->will($this->onConsecutiveCalls(null, false));
+        $this->subject->expects($this->once())
+            ->method('getSystemWhereClause')
+            ->will($this->returnValue('1=1 AND pages.no_search = 0'));
 
         $this->assertSame(
             '1=1 AND pages.no_search = 0',
@@ -76,6 +79,9 @@ class TcaTableServiceTest extends AbstractUnitTestCase
             ->method('getIfExists')
             ->withConsecutive(['indexing.table.additionalWhereClause'], ['indexing.table.rootLineBlacklist'])
             ->will($this->onConsecutiveCalls('table.field = "someValue"', false));
+        $this->subject->expects($this->once())
+            ->method('getSystemWhereClause')
+            ->will($this->returnValue('1=1 AND pages.no_search = 0'));
 
         $this->assertSame(
             '1=1 AND pages.no_search = 0 AND table.field = "someValue"',