diff --git a/scribeengine/controllers/post.py b/scribeengine/controllers/post.py
index 9cc5232..6f695e3 100644
--- a/scribeengine/controllers/post.py
+++ b/scribeengine/controllers/post.py
@@ -84,7 +84,8 @@ class PostController(BaseController):
         db_tags = Session.query(Tag).filter(Tag.url.in_(tag_urls)).all()
         post.tags = []
         for tag in db_tags:
-            tag_list.remove(tag.name)
+            if tag.name in tag_list:
+                tag_list.remove(tag.name)
             post.tags.append(tag)
         for tag in tag_list:
             post.tags.append(Tag(name=tag, url=utils.generate_url(tag)))