diff --git a/lib/Db/View.php b/lib/Db/View.php
index e3d87a9e63..34783f76ef 100644
--- a/lib/Db/View.php
+++ b/lib/Db/View.php
@@ -114,7 +114,7 @@ public function getColumnsSettingsArray(): array {
 		}
 
 		if (is_array(reset($columns))) {
-			return array_map(static fn (array $a): ViewColumnInformation => ViewColumnInformation::fromArray($a), $columns);
+			return array_values(array_map(static fn (array $a): ViewColumnInformation => ViewColumnInformation::fromArray($a), $columns));
 		}
 
 		$result = [];
diff --git a/lib/Service/ViewService.php b/lib/Service/ViewService.php
index cc05fc5b81..9a8b558d68 100644
--- a/lib/Service/ViewService.php
+++ b/lib/Service/ViewService.php
@@ -535,6 +535,9 @@ protected function removeColumnFromFilters(array $originalFilterSetArray, int $c
 				}
 				$currentGroup[] = $filterArray;
 			}
+			if (empty($currentGroup)) {
+				continue;
+			}
 			$applicableFilterSetArray[] = $currentGroup;
 		}
 		return $applicableFilterSetArray;