diff --git a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
index 97797426a0c..cd163554d93 100644
--- a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
+++ b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
@@ -130,14 +130,19 @@ export default {
 		 * @returns {number}
 		 */
 		sortParticipants(participant1, participant2) {
-			let session1 = participant1.sessionId
-			let session2 = participant2.sessionId
+			const session1 = participant1.sessionId
+			const session2 = participant2.sessionId
+			/**
+			 * For now the user status is not overwriting the online-offline status anymore
+			 * It felt too weird having users appear as offline but they are in the call or chat actively
 			if (participant1.status === 'offline') {
 				session1 = '0'
 			}
 			if (participant2.status === 'offline') {
 				session2 = '0'
 			}
+			 */
+
 			if (session1 === '0') {
 				if (session2 !== '0') {
 					return 1
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index b1017c6be83..e8ff85bb0c1 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -373,7 +373,12 @@ export default {
 		},
 
 		isOffline() {
-			return /* this.participant.status === 'offline' || */ this.sessionId === '0'
+			/**
+			 * For now the user status is not overwriting the online-offline status anymore
+			 * It felt too weird having users appear as offline but they are in the call or chat actively
+			 return this.participant.status === 'offline' || this.sessionId === '0'
+			 */
+			return this.sessionId === '0'
 		},
 		isGuest() {
 			return [PARTICIPANT.TYPE.GUEST, PARTICIPANT.TYPE.GUEST_MODERATOR].indexOf(this.participantType) !== -1