diff --git a/Query/FilteredQuery.php b/Query/FilteredQuery.php
index e216d266560052276c5d3e3113d73bd999eb13ef..bc4d8f700fb94baf2c2851608dd62149ac3326cd 100644
--- a/Query/FilteredQuery.php
+++ b/Query/FilteredQuery.php
@@ -69,8 +69,8 @@ class FilteredQuery extends AbstractFilter implements BuilderInterface
         $output = [];
         $output['filter'] = parent::toArray();
 
-        if ($this->query !== null) {
-            $output['query'] = $this->query->toArray();
+        if ($this->query) {
+            $output['query'][$this->getQuery()->getType()] = $this->getQuery()->toArray();
         }
 
         return $output;