diff --git a/library/Class/FilterSettings.php b/library/Class/FilterSettings.php
index 4d561f0374e8418eaede4860ad7d2cb5112ab2c1..4ade064f66dbe140fea106a1066c0059792e747e 100644
--- a/library/Class/FilterSettings.php
+++ b/library/Class/FilterSettings.php
@@ -72,8 +72,14 @@ class Class_FilterSettings extends Class_Entity {
 
 
   public function getActiveFilters() {
-    return array_merge($this->getDefaultFilters(),
-                       $this->getSelectedFilters());
+    if(!$default_filters = $this->getDefaultFilters())
+      return $this->getSelectedFilters();
+
+    if(!$selected_filters = $this->getSelectedFilters())
+      return $default_filters;
+
+    return array_merge($default_filters,
+                       $selected_filters);
   }
 }
 ?>
\ No newline at end of file