diff --git a/packages/services/conversation-service/src/adapters/outbound/persistence/conversation-postgres.repository.ts b/packages/services/conversation-service/src/adapters/outbound/persistence/conversation-postgres.repository.ts
index 0bc45f6..e18ac54 100644
--- a/packages/services/conversation-service/src/adapters/outbound/persistence/conversation-postgres.repository.ts
+++ b/packages/services/conversation-service/src/adapters/outbound/persistence/conversation-postgres.repository.ts
@@ -60,7 +60,8 @@ export class ConversationPostgresRepository
     hoursBack?: number;
     minMessageCount?: number;
   }): Promise<ConversationEntity[]> {
-    const queryBuilder = this.createTenantQueryBuilder('conversation');
+    const queryBuilder = this.createTenantQueryBuilder('conversation')
+      .andWhere('conversation.status != :deletedStatus', { deletedStatus: 'DELETED' });
 
     if (options.status) {
       queryBuilder.andWhere('conversation.status = :status', { status: options.status });
diff --git a/packages/services/conversation-service/src/application/services/conversation.service.ts b/packages/services/conversation-service/src/application/services/conversation.service.ts
index c51d6bb..5817c6c 100644
--- a/packages/services/conversation-service/src/application/services/conversation.service.ts
+++ b/packages/services/conversation-service/src/application/services/conversation.service.ts
@@ -87,7 +87,7 @@ export class ConversationService {
   ): Promise<ConversationEntity> {
     const conversation = await this.conversationRepo.findById(conversationId);
 
-    if (!conversation || conversation.userId !== userId) {
+    if (!conversation || conversation.userId !== userId || conversation.isDeleted()) {
       throw new NotFoundException('Conversation not found');
     }