diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php
index d25058235..f269cd138 100644
--- a/library/Icinga/Data/Db/DbQuery.php
+++ b/library/Icinga/Data/Db/DbQuery.php
@@ -381,6 +381,7 @@ class DbQuery extends SimpleQuery
 
     public function __clone()
     {
+        parent::__clone();
         $this->select = clone $this->select;
     }
 
diff --git a/library/Icinga/Data/SimpleQuery.php b/library/Icinga/Data/SimpleQuery.php
index 769481e13..1183ff327 100644
--- a/library/Icinga/Data/SimpleQuery.php
+++ b/library/Icinga/Data/SimpleQuery.php
@@ -550,4 +550,12 @@ class SimpleQuery implements QueryInterface, Queryable, Iterator
     {
         return $this->columns;
     }
+
+    /**
+     * Deep clone self::$filter
+     */
+    public function __clone()
+    {
+        $this->filter = clone $this->filter;
+    }
 }