diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index c89c6b27be13d..e5cb05946e241 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -49,6 +49,7 @@ class QueryBuilder implements IQueryBuilder {
 
 	/** @var bool */
 	private $automaticTablePrefix = true;
+	private bool $nonEmptyWhere = false;
 
 	/** @var string */
 	protected $lastInsertedTable;
@@ -189,24 +190,24 @@ private function prepareForExecute() {
 			}
 		}
 
-		if (!empty($this->getQueryPart('select'))) {
-			$select = $this->getQueryPart('select');
-			$hasSelectAll = array_filter($select, static function ($s) {
-				return $s === '*';
-			});
-			$hasSelectSpecific = array_filter($select, static function ($s) {
-				return $s !== '*';
-			});
-
-			if (empty($hasSelectAll) === empty($hasSelectSpecific)) {
-				$exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.');
-				$this->logger->error($exception->getMessage(), [
-					'query' => $this->getSQL(),
-					'app' => 'core',
-					'exception' => $exception,
-				]);
-			}
-		}
+		// if (!empty($this->getQueryPart('select'))) {
+		// $select = $this->getQueryPart('select');
+		// $hasSelectAll = array_filter($select, static function ($s) {
+		// return $s === '*';
+		// });
+		// $hasSelectSpecific = array_filter($select, static function ($s) {
+		// return $s !== '*';
+		// });
+
+		// if (empty($hasSelectAll) === empty($hasSelectSpecific)) {
+		// $exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.');
+		// $this->logger->error($exception->getMessage(), [
+		// 'query' => $this->getSQL(),
+		// 'app' => 'core',
+		// 'exception' => $exception,
+		// ]);
+		// }
+		// }
 
 		$numberOfParameters = 0;
 		$hasTooLargeArrayParameter = false;
@@ -834,12 +835,14 @@ public function set($key, $value) {
 	 * @return $this This QueryBuilder instance.
 	 */
 	public function where(...$predicates) {
-		if ($this->getQueryPart('where') !== null && $this->systemConfig->getValue('debug', false)) {
+		if ($this->nonEmptyWhere && $this->systemConfig->getValue('debug', false)) {
 			// Only logging a warning, not throwing for now.
 			$e = new QueryException('Using where() on non-empty WHERE part, please verify it is intentional to not call andWhere() or orWhere() instead. Otherwise consider creating a new query builder object or call resetQueryPart(\'where\') first.');
 			$this->logger->warning($e->getMessage(), ['exception' => $e]);
 		}
 
+		$this->nonEmptyWhere = true;
+
 		call_user_func_array(
 			[$this->queryBuilder, 'where'],
 			$predicates
@@ -867,6 +870,7 @@ public function where(...$predicates) {
 	 * @see where()
 	 */
 	public function andWhere(...$where) {
+		$this->nonEmptyWhere = true;
 		call_user_func_array(
 			[$this->queryBuilder, 'andWhere'],
 			$where
@@ -894,6 +898,7 @@ public function andWhere(...$where) {
 	 * @see where()
 	 */
 	public function orWhere(...$where) {
+		$this->nonEmptyWhere = true;
 		call_user_func_array(
 			[$this->queryBuilder, 'orWhere'],
 			$where