diff --git a/dbaas/notification/tasks.py b/dbaas/notification/tasks.py
index a4d80ec63..f8e04edd3 100644
--- a/dbaas/notification/tasks.py
+++ b/dbaas/notification/tasks.py
@@ -796,6 +796,7 @@ def upgrade_mongodb_24_to_30(self, database, user, task_history=None):
 
 @app.task(bind=True)
 def database_disk_resize(self, database, disk_offering, task_history, user):
+    from dbaas_nfsaas.models import HostAttr
     from workflow.steps.util.nfsaas_utils import resize_disk
 
     AuditRequest.new_request("database_disk_resize", user, "localhost")
@@ -816,7 +817,10 @@ def database_disk_resize(self, database, disk_offering, task_history, user):
             details='\nLoading Disk offering'
         )
 
-        for instance in databaseinfra.instances.all():
+        for instance in databaseinfra.get_driver().get_database_instances():
+            if not HostAttr.objects.filter(host_id=instance.hostname_id).exists():
+                continue
+
             task_history.update_details(
                 persist=True,
                 details='\nChanging instance {} to '
diff --git a/dbaas/workflow/steps/util/nfsaas_utils.py b/dbaas/workflow/steps/util/nfsaas_utils.py
index 1c6652488..feba7f002 100644
--- a/dbaas/workflow/steps/util/nfsaas_utils.py
+++ b/dbaas/workflow/steps/util/nfsaas_utils.py
@@ -118,5 +118,7 @@ def clean_unused_data(export_id):
 
 def resize_disk(environment, host, disk_offering):
     provider = get_faas_provider(environment=environment)
-    disk = HostAttr.objects.get(host=host)
-    return provider.resize(disk.nfsaas_path_host, disk_offering.size_kb)
+    for disk in HostAttr.objects.filter(host=host):
+        if not provider.resize(disk.nfsaas_path_host, disk_offering.size_kb):
+            return False
+    return True