diff --git a/freezer_api/storage/elastic.py b/freezer_api/storage/elastic.py
index fa90d57b..c443b109 100644
--- a/freezer_api/storage/elastic.py
+++ b/freezer_api/storage/elastic.py
@@ -164,7 +164,7 @@ class ClientTypeManager(TypeManager):
         search = search or {}
         base_filter = TypeManager.get_base_search_filter(user_id, search)
         if doc_id is not None:
-            base_filter.append({"term": {"client_id": doc_id}})
+            base_filter.append({"term": {"client.client_id": doc_id}})
         query_filter = {"filter": {"bool": {"must": base_filter}}}
         return {'query': {'filtered': query_filter}}
 
diff --git a/freezer_api/tests/unit/test_elastic.py b/freezer_api/tests/unit/test_elastic.py
index 6125866f..43140c87 100644
--- a/freezer_api/tests/unit/test_elastic.py
+++ b/freezer_api/tests/unit/test_elastic.py
@@ -200,7 +200,7 @@ class ClientTypeManager(unittest.TestCase):
                                                     [{'match': {'some_field': 'some text'}},
                                                      {'match': {'description': 'some other text'}}]}}
                                       },
-                                      {'term': {'client_id': 'my_doc_id'}}
+                                      {'term': {'client.client_id': 'my_doc_id'}}
                                      ]}}}}}
         self.assertEqual(q, expected_q)