diff --git a/apps/comments/src/services/GetComments.js b/apps/comments/src/services/GetComments.js
index 7dffa969a69..bf3dd31b5f1 100644
--- a/apps/comments/src/services/GetComments.js
+++ b/apps/comments/src/services/GetComments.js
@@ -22,6 +22,7 @@
 
 import { parseXML, prepareFileFromProps } from 'webdav/dist/node/tools/dav'
 import { processResponsePayload } from 'webdav/dist/node/response'
+import { decodeHtmlEntities } from '../utils/decodeHtmlEntities'
 import client from './DavClient'
 
 export const DEFAULT_LIMIT = 20
@@ -89,16 +90,3 @@ function processMultistatus(result, isDetailed = false) {
 		return prepareFileFromProps(decodedProps, decodedProps.id.toString(), isDetailed)
 	})
 }
-
-/**
- * @param {any} value -
- * @param {any} passes -
- */
-function decodeHtmlEntities(value, passes = 1) {
-	const parser = new DOMParser()
-	let decoded = value
-	for (let i = 0; i < passes; i++) {
-		decoded = parser.parseFromString(decoded, 'text/html').documentElement.textContent
-	}
-	return decoded
-}
diff --git a/apps/comments/src/services/NewComment.js b/apps/comments/src/services/NewComment.js
index eaf08cc10b9..27d227ed656 100644
--- a/apps/comments/src/services/NewComment.js
+++ b/apps/comments/src/services/NewComment.js
@@ -22,6 +22,7 @@
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { getRootPath } from '../utils/davUtils'
+import { decodeHtmlEntities } from '../utils/decodeHtmlEntities'
 import axios from '@nextcloud/axios'
 import client from './DavClient'
 
@@ -55,5 +56,12 @@ export default async function(commentsType, ressourceId, message) {
 		details: true,
 	})
 
+	const props = comment.data.props
+	// Decode twice to handle potentially double-encoded entities
+	// FIXME Remove this once https://github.com/nextcloud/server/issues/29306
+	// is resolved
+	props.actorDisplayName = decodeHtmlEntities(props.actorDisplayName, 2)
+	props.message = decodeHtmlEntities(props.message, 2)
+
 	return comment.data
 }
diff --git a/apps/comments/src/utils/decodeHtmlEntities.js b/apps/comments/src/utils/decodeHtmlEntities.js
new file mode 100644
index 00000000000..60c08163faa
--- /dev/null
+++ b/apps/comments/src/utils/decodeHtmlEntities.js
@@ -0,0 +1,34 @@
+/**
+ * @copyright Copyright (c) 2021 Christopher Ng <chrng8@gmail.com>
+ *
+ * @author Christopher Ng <chrng8@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @param {any} value -
+ * @param {any} passes -
+ */
+export function decodeHtmlEntities(value, passes = 1) {
+	const parser = new DOMParser()
+	let decoded = value
+	for (let i = 0; i < passes; i++) {
+		decoded = parser.parseFromString(decoded, 'text/html').documentElement.textContent
+	}
+	return decoded
+}
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
index e10ee6cb0a0..07980bb673f 100644
Binary files a/dist/comments-comments-app.js and b/dist/comments-comments-app.js differ
diff --git a/dist/comments-comments-app.js.LICENSE.txt b/dist/comments-comments-app.js.LICENSE.txt
index 1e2a46776b9..f35b0b78fe9 100644
Binary files a/dist/comments-comments-app.js.LICENSE.txt and b/dist/comments-comments-app.js.LICENSE.txt differ
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
index 271c5c5fa17..50648a55bad 100644
Binary files a/dist/comments-comments-app.js.map and b/dist/comments-comments-app.js.map differ