diff --git a/lbry/lbry/schema/tags.py b/lbry/lbry/schema/tags.py
index 015836e1c..7283ea602 100644
--- a/lbry/lbry/schema/tags.py
+++ b/lbry/lbry/schema/tags.py
@@ -10,4 +10,4 @@ def normalize_tag(tag: str):
 
 
 def clean_tags(tags: List[str]):
-    return [tag for tag in (normalize_tag(tag) for tag in tags) if tag]
+    return [tag for tag in set(normalize_tag(tag) for tag in tags) if tag]
diff --git a/lbry/lbry/wallet/server/db/writer.py b/lbry/lbry/wallet/server/db/writer.py
index 3fdf3998c..edf12190f 100644
--- a/lbry/lbry/wallet/server/db/writer.py
+++ b/lbry/lbry/wallet/server/db/writer.py
@@ -124,8 +124,7 @@ class SQLDB:
             height integer not null
         );
         create index if not exists tag_tag_idx on tag (tag);
-        create index if not exists tag_claim_hash_idx on tag (claim_hash);
-        create index if not exists tag_height_idx on tag (height);
+        create unique index if not exists tag_claim_hash_tag_idx on tag (claim_hash, tag);
     """
 
     CREATE_CLAIMTRIE_TABLE = """
@@ -200,7 +199,7 @@ class SQLDB:
         self.execute('commit;')
 
     def _upsertable_claims(self, txos: List[Output], header, clear_first=False):
-        claim_hashes, claims, tags = [], [], []
+        claim_hashes, claims, tags = [], [], {}
         for txo in txos:
             tx = txo.tx_ref.tx
 
@@ -254,14 +253,14 @@ class SQLDB:
                 claim_record['claim_type'] = CLAIM_TYPES['channel']
 
             for tag in clean_tags(claim.message.tags):
-                tags.append((tag, claim_hash, tx.height))
+                tags[(tag, claim_hash)] = (tag, claim_hash, tx.height)
 
         if clear_first:
             self._clear_claim_metadata(claim_hashes)
 
         if tags:
             self.db.executemany(
-                "INSERT INTO tag (tag, claim_hash, height) VALUES (?, ?, ?)", tags
+                "INSERT INTO tag (tag, claim_hash, height) VALUES (?, ?, ?)", tags.values()
             )
 
         return claims
diff --git a/lbry/tests/unit/schema/test_tags.py b/lbry/tests/unit/schema/test_tags.py
index f1517f41c..110506832 100644
--- a/lbry/tests/unit/schema/test_tags.py
+++ b/lbry/tests/unit/schema/test_tags.py
@@ -17,3 +17,7 @@ class TestTagNormalization(unittest.TestCase):
 
     def test_clean_tags(self):
         self.assertEqual(['tag'], clean_tags([' \t #!~', '!taG', '\t']))
+        cleaned = clean_tags(['fOo', '!taG', 'FoO'])
+        self.assertIn('tag', cleaned)
+        self.assertIn('foo', cleaned)
+        self.assertEqual(len(cleaned), 2)