diff --git a/apps/cloudbroker/base/cloudapi__disks/methodclass/cloudapi_disks.py b/apps/cloudbroker/base/cloudapi__disks/methodclass/cloudapi_disks.py
index f68d2e3f6..c1c524934 100644
--- a/apps/cloudbroker/base/cloudapi__disks/methodclass/cloudapi_disks.py
+++ b/apps/cloudbroker/base/cloudapi__disks/methodclass/cloudapi_disks.py
@@ -153,6 +153,8 @@ def list(self, accountId, type, **kwargs):
         :return: list with every element containing details of a disk as a dict
         """
         query = {'accountId': {'$in': [accountId, None]}, 'status': {'$ne': 'DESTROYED'}}
+        if type:
+            query['type'] = type
         disks = self.models.disk.search(query)[1:]
         diskids = [disk['id'] for disk in disks]
         query = {'disks': {'$in': diskids}}