diff --git a/src/discussion_formatters.py b/src/discussion_formatters.py
index 8cfdb23..6b8b624 100644
--- a/src/discussion_formatters.py
+++ b/src/discussion_formatters.py
@@ -150,7 +150,7 @@ def embed_formatter(post_type, post, article_paths):
 			if post["_embedded"]["thread"][0]["tags"]:
 				tag_displayname = []
 				for tag in post["_embedded"]["thread"][0]["tags"]:
-					tag_displayname.append("[{title}]({url})".format(title=tag["articleTitle"], url=create_article_path(tag["articleTitle"])))
+					tag_displayname.append("[{title}]({url})".format(title=tag["articleTitle"], url=create_article_path(quote_plus(tag["articleTitle"].replace(" ", "_"), "/:?=&"))))
 				if len(", ".join(tag_displayname)) > 1000:
 					embed.add_field(_("Tags"), _("{} tags").format(len(post["_embedded"]["thread"][0]["tags"])))
 				else: