diff --git a/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt b/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt
index 0afd660d..d29ac717 100644
--- a/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt
+++ b/common/src/main/java/com/yogeshpaliyal/common/db/DbDao.kt
@@ -81,7 +81,7 @@ interface DbDao {
     @Query("SELECT * FROM account WHERE unique_id = :uniqueId")
     suspend fun getAccount(uniqueId: String?): AccountModel?
 
-    @Query("SELECT DISTINCT tags FROM account")
+    @Query("SELECT DISTINCT tags FROM account WHERE tags IS NOT NULL AND tags <> ''")
     fun getTags(): Flow<List<String>>
 
     @Query("DELETE from account WHERE id = :id")