diff --git a/pkg/database/db_manager.go b/pkg/database/db_manager.go
index 85ed9647b7..6fa3147aa0 100644
--- a/pkg/database/db_manager.go
+++ b/pkg/database/db_manager.go
@@ -266,10 +266,15 @@ func (m *DBManager) Has(name string) bool {
 }
 
 func (m *DBManager) HasIndex(idx int) bool {
-	m.dbMutex.RLock()
-	defer m.dbMutex.RUnlock()
+	db, exists := m.getDB(idx)
+	if !exists {
+		return false
+	}
+
+	db.mtx.Lock()
+	defer db.mtx.Unlock()
 
-	return idx >= 0 && idx < len(m.databases)
+	return !db.deleted
 }
 
 func (m *DBManager) GetIndexByName(name string) int {