diff --git a/content.py b/content.py
index 56a768921..19bf21921 100644
--- a/content.py
+++ b/content.py
@@ -639,7 +639,7 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
     if longWordsList:
         content = removeLongWords(content, maxWordLength, longWordsList)
     content = content.replace(' --linebreak-- ', '</p><p>')
-    return '<p>' + htmlReplaceQuoteMarks(content) + '</p>'
+    return '<p>' + content + '</p>'
 
 
 def getMentionsFromHtml(htmlText: str,
diff --git a/webinterface.py b/webinterface.py
index c747a4e93..34547f5f5 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -57,6 +57,7 @@ from bookmarks import bookmarkedByPerson
 from announce import announcedByPerson
 from blocking import isBlocked
 from blocking import isBlockedHashtag
+from content import htmlReplaceQuoteMarks
 from content import removeTextFormatting
 from content import switchWords
 from content import getMentionsFromHtml
@@ -4260,8 +4261,10 @@ def individualPostAsHtml(recentPostsCache: {}, maxRecentPosts: int,
         objectContent = removeTextFormatting(objectContent)
         objectContent = \
             switchWords(baseDir, nickname, domain, objectContent)
+        objectContent = htmlReplaceQuoteMarks(objectContent)
     else:
-        objectContent = postJsonObject['object']['content']
+        objectContent = \
+            htmlReplaceQuoteMarks(postJsonObject['object']['content'])
 
     if not postIsSensitive:
         contentStr = objectContent + attachmentStr