diff --git a/frontend/src/components/input/Reactions.vue b/frontend/src/components/input/Reactions.vue
index c6f018a94..95c4224da 100644
--- a/frontend/src/components/input/Reactions.vue
+++ b/frontend/src/components/input/Reactions.vue
@@ -154,7 +154,7 @@ async function toggleReaction(value: string) {
 				v-if="showEmojiPicker"
 				class="emoji-picker"
 				:style="{left: emojiPickerPosition?.left + 'px'}"
-				@emojiClick.stop="detail => addReaction(detail.unicode)"
+				@emojiClick="detail => addReaction(detail.unicode)"
 				ref="emojiPickerRef"
 			/>
 		</CustomTransition>
diff --git a/frontend/src/components/tasks/partials/comments.vue b/frontend/src/components/tasks/partials/comments.vue
index 188336f4f..644bf4f14 100644
--- a/frontend/src/components/tasks/partials/comments.vue
+++ b/frontend/src/components/tasks/partials/comments.vue
@@ -97,6 +97,12 @@
 							editComment()
 						}"
 					/>
+					<Reactions 
+						class="mt-2"
+						entity-kind="comments" 
+						:entity-id="c.id"
+						v-model="c.reactions"
+					/>
 				</div>
 			</div>
 			<div
@@ -190,6 +196,7 @@ import {formatDateLong, formatDateSince} from '@/helpers/time/formatDate'
 import {getAvatarUrl, getDisplayName} from '@/models/user'
 import {useConfigStore} from '@/stores/config'
 import {useAuthStore} from '@/stores/auth'
+import Reactions from '@/components/input/Reactions.vue'
 
 const props = defineProps({
 	taskId: {
diff --git a/frontend/src/modelTypes/ITaskComment.ts b/frontend/src/modelTypes/ITaskComment.ts
index 4246ab13d..6843cdd0a 100644
--- a/frontend/src/modelTypes/ITaskComment.ts
+++ b/frontend/src/modelTypes/ITaskComment.ts
@@ -1,12 +1,15 @@
 import type {IAbstract} from './IAbstract'
 import type {IUser} from './IUser'
 import type {ITask} from './ITask'
+import type {IReactionPerEntity} from '@/modelTypes/IReaction'
 
 export interface ITaskComment extends IAbstract {
 	id: number
 	taskId: ITask['id']
 	comment: string
 	author: IUser
+	
+	reactions: IReactionPerEntity
 
 	created: Date
 	updated: Date
diff --git a/frontend/src/models/taskComment.ts b/frontend/src/models/taskComment.ts
index 4579140fc..5928ca5d6 100644
--- a/frontend/src/models/taskComment.ts
+++ b/frontend/src/models/taskComment.ts
@@ -10,6 +10,8 @@ export default class TaskCommentModel extends AbstractModel<ITaskComment> implem
 	taskId: ITask['id'] = 0
 	comment = ''
 	author: IUser = UserModel
+	
+	reactions = {}
 
 	created: Date = null
 	updated: Date = null
@@ -21,5 +23,11 @@ export default class TaskCommentModel extends AbstractModel<ITaskComment> implem
 		this.author = new UserModel(this.author)
 		this.created = new Date(this.created)
 		this.updated = new Date(this.updated)
+		
+		// We can't convert emojis to camel case, hence we do this manually
+		this.reactions = {}
+		Object.keys(data.reactions || {}).forEach(reaction => {
+			this.reactions[reaction] = data.reactions[reaction].map(u => new UserModel(u))
+		})
 	}
 }