diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 7dddd0aa03..0ec7da5a2b 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -445,14 +445,24 @@
 				uid = ids[1];
 
 			if (thread_state.locked !== '1') {
-				if (this.children[2].className == 'icon-star-empty') {
+				var element = $(this).find('i');
+				if(element.attr('class') == 'icon-star-empty') {
+					element.attr('class', 'icon-star');
+					socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
+				}
+				else {
+					element.attr('class', 'icon-star-empty');
+					socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
+				}
+				
+				/*if (this.children[2].className == 'icon-star-empty') {
 					this.children[2].className = 'icon-star';
 					socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
 				}
 				else {
 					this.children[2].className = 'icon-star-empty';
 					socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
-				}
+				}*/
 			}
 		});
 	}