diff --git a/api/controllers/console/files.py b/api/controllers/console/files.py
index 74543e3a10..56412d5bda 100644
--- a/api/controllers/console/files.py
+++ b/api/controllers/console/files.py
@@ -20,9 +20,9 @@ from controllers.console.wraps import (
     cloud_edition_billing_resource_check,
     setup_required,
 )
+from extensions.ext_database import db
 from fields.file_fields import file_fields, upload_config_fields
 from libs.login import login_required
-from models import db
 from services.file_service import FileService
 
 PREVIEW_WORDS_LIMIT = 3000
diff --git a/api/controllers/console/remote_files.py b/api/controllers/console/remote_files.py
index e0a31bccbb..dd4f34b9bd 100644
--- a/api/controllers/console/remote_files.py
+++ b/api/controllers/console/remote_files.py
@@ -14,8 +14,8 @@ from controllers.common.errors import (
 )
 from core.file import helpers as file_helpers
 from core.helper import ssrf_proxy
+from extensions.ext_database import db
 from fields.file_fields import file_fields_with_signed_url, remote_file_info_fields
-from models import db
 from models.account import Account
 from services.file_service import FileService
 
diff --git a/api/controllers/files/image_preview.py b/api/controllers/files/image_preview.py
index 643441a310..0efee0c377 100644
--- a/api/controllers/files/image_preview.py
+++ b/api/controllers/files/image_preview.py
@@ -7,7 +7,7 @@ from werkzeug.exceptions import NotFound
 import services
 from controllers.common.errors import UnsupportedFileTypeError
 from controllers.files import files_ns
-from models import db
+from extensions.ext_database import db
 from services.account_service import TenantService
 from services.file_service import FileService
 
diff --git a/api/controllers/service_api/app/file.py b/api/controllers/service_api/app/file.py
index b8da10bec3..ffe4e0b492 100644
--- a/api/controllers/service_api/app/file.py
+++ b/api/controllers/service_api/app/file.py
@@ -12,8 +12,9 @@ from controllers.common.errors import (
 )
 from controllers.service_api import service_api_ns
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
+from extensions.ext_database import db
 from fields.file_fields import build_file_model
-from models import App, EndUser, db
+from models import App, EndUser
 from services.file_service import FileService
 
 
diff --git a/api/controllers/web/files.py b/api/controllers/web/files.py
index 49b86a355d..80ad61e549 100644
--- a/api/controllers/web/files.py
+++ b/api/controllers/web/files.py
@@ -11,8 +11,8 @@ from controllers.common.errors import (
 )
 from controllers.web import web_ns
 from controllers.web.wraps import WebApiResource
+from extensions.ext_database import db
 from fields.file_fields import build_file_model
-from models import db
 from services.file_service import FileService
 
 
diff --git a/api/controllers/web/remote_files.py b/api/controllers/web/remote_files.py
index 2d84e52c5e..0983e30b9d 100644
--- a/api/controllers/web/remote_files.py
+++ b/api/controllers/web/remote_files.py
@@ -14,8 +14,8 @@ from controllers.web import web_ns
 from controllers.web.wraps import WebApiResource
 from core.file import helpers as file_helpers
 from core.helper import ssrf_proxy
+from extensions.ext_database import db
 from fields.file_fields import build_file_with_signed_url_model, build_remote_file_info_model
-from models import db
 from services.file_service import FileService
 
 
diff --git a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
index 29a66f1d9d..7cdc3cb205 100644
--- a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
+++ b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
@@ -5,7 +5,8 @@ import pytest
 from sqlalchemy import delete
 
 from core.variables.segments import StringSegment
-from models import Tenant, db
+from extensions.ext_database import db
+from models import Tenant
 from models.enums import CreatorUserRole
 from models.model import App, UploadFile
 from models.workflow import WorkflowDraftVariable, WorkflowDraftVariableFile
@@ -259,6 +260,7 @@ class TestDeleteDraftVariablesWithOffloadIntegration:
 
         # Create WorkflowDraftVariableFile records
         from core.variables.types import SegmentType
+
         var_file1 = WorkflowDraftVariableFile(
             tenant_id=tenant.id,
             app_id=app.id,
diff --git a/api/tests/integration_tests/test_offload.py b/api/tests/integration_tests/test_offload.py
index a49330475e..95d90e8786 100644
--- a/api/tests/integration_tests/test_offload.py
+++ b/api/tests/integration_tests/test_offload.py
@@ -3,9 +3,9 @@ import uuid
 import pytest
 from sqlalchemy.orm import Session, joinedload, selectinload
 
+from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from libs.uuid_utils import uuidv7
-from models import db
 from models.enums import CreatorUserRole
 from models.model import UploadFile
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload, WorkflowNodeExecutionTriggeredFrom