diff --git a/surfsense_backend/app/routes/obsidian_plugin_routes.py b/surfsense_backend/app/routes/obsidian_plugin_routes.py
index 0dae7a463..512596550 100644
--- a/surfsense_backend/app/routes/obsidian_plugin_routes.py
+++ b/surfsense_backend/app/routes/obsidian_plugin_routes.py
@@ -43,7 +43,7 @@ from app.schemas.obsidian_plugin import (
     SyncAckItem,
     SyncBatchRequest,
 )
-from app.services.notification_service import NotificationService
+from app.notifications.service import NotificationService
 from app.services.obsidian_plugin_indexer import (
     delete_note,
     get_manifest,
diff --git a/surfsense_backend/app/routes/search_source_connectors_routes.py b/surfsense_backend/app/routes/search_source_connectors_routes.py
index 3060fdf4a..362b4d232 100644
--- a/surfsense_backend/app/routes/search_source_connectors_routes.py
+++ b/surfsense_backend/app/routes/search_source_connectors_routes.py
@@ -55,7 +55,7 @@ from app.schemas import (
     SearchSourceConnectorUpdate,
 )
 from app.services.composio_service import ComposioService, get_composio_service
-from app.services.notification_service import NotificationService
+from app.notifications.service import NotificationService
 from app.users import current_active_user
 
 # NOTE: connector indexer functions are imported lazily inside each
diff --git a/surfsense_backend/app/services/chat_comments_service.py b/surfsense_backend/app/services/chat_comments_service.py
index 54662fe5b..c9afb8a67 100644
--- a/surfsense_backend/app/services/chat_comments_service.py
+++ b/surfsense_backend/app/services/chat_comments_service.py
@@ -31,7 +31,7 @@ from app.schemas.chat_comments import (
     MentionListResponse,
     MentionResponse,
 )
-from app.services.notification_service import NotificationService
+from app.notifications.service import NotificationService
 from app.utils.chat_comments import parse_mentions, render_mentions
 from app.utils.rbac import check_permission, get_user_permissions
 
diff --git a/surfsense_backend/app/tasks/celery_tasks/document_tasks.py b/surfsense_backend/app/tasks/celery_tasks/document_tasks.py
index 4781ca6a5..4ee2de62f 100644
--- a/surfsense_backend/app/tasks/celery_tasks/document_tasks.py
+++ b/surfsense_backend/app/tasks/celery_tasks/document_tasks.py
@@ -10,7 +10,7 @@ from uuid import UUID
 from app.celery_app import celery_app
 from app.config import config
 from app.observability import metrics as ot_metrics
-from app.services.notification_service import NotificationService
+from app.notifications.service import NotificationService
 from app.services.task_logging_service import TaskLoggingService
 from app.tasks.celery_tasks import get_celery_session_maker, run_async_celery_task
 from app.tasks.connector_indexers.local_folder_indexer import (
diff --git a/surfsense_backend/app/tasks/celery_tasks/schedule_checker_task.py b/surfsense_backend/app/tasks/celery_tasks/schedule_checker_task.py
index e41251407..e88fb58b9 100644
--- a/surfsense_backend/app/tasks/celery_tasks/schedule_checker_task.py
+++ b/surfsense_backend/app/tasks/celery_tasks/schedule_checker_task.py
@@ -6,7 +6,8 @@ from datetime import UTC, datetime
 from sqlalchemy.future import select
 
 from app.celery_app import celery_app
-from app.db import Notification, SearchSourceConnector, SearchSourceConnectorType
+from app.db import SearchSourceConnector, SearchSourceConnectorType
+from app.notifications.persistence import Notification
 from app.tasks.celery_tasks import get_celery_session_maker, run_async_celery_task
 from app.utils.indexing_locks import is_connector_indexing_locked
 
diff --git a/surfsense_backend/app/tasks/celery_tasks/stale_notification_cleanup_task.py b/surfsense_backend/app/tasks/celery_tasks/stale_notification_cleanup_task.py
index d51c85dee..5bf857d9b 100644
--- a/surfsense_backend/app/tasks/celery_tasks/stale_notification_cleanup_task.py
+++ b/surfsense_backend/app/tasks/celery_tasks/stale_notification_cleanup_task.py
@@ -33,7 +33,8 @@ from sqlalchemy.future import select
 
 from app.celery_app import celery_app
 from app.config import config
-from app.db import Document, DocumentStatus, Notification
+from app.db import Document, DocumentStatus
+from app.notifications.persistence import Notification
 from app.tasks.celery_tasks import get_celery_session_maker, run_async_celery_task
 
 logger = logging.getLogger(__name__)
diff --git a/surfsense_backend/app/tasks/document_processors/file_processors.py b/surfsense_backend/app/tasks/document_processors/file_processors.py
index 137c27cda..17472b803 100644
--- a/surfsense_backend/app/tasks/document_processors/file_processors.py
+++ b/surfsense_backend/app/tasks/document_processors/file_processors.py
@@ -15,8 +15,9 @@ from dataclasses import dataclass, field
 from fastapi import HTTPException
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.db import Document, Log, Notification
-from app.services.notification_service import NotificationService
+from app.db import Document, Log
+from app.notifications.persistence import Notification
+from app.notifications.service import NotificationService
 from app.services.task_logging_service import TaskLoggingService
 
 from ._helpers import update_document_from_connector