diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index eaa63205759..d2ea42946ef 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<NcAppSidebar v-if="token"
+	<NcAppSidebar v-if="isSidebarAvailable"
 		:open="opened"
 		:name="conversation.displayName"
 		:title="conversation.displayName"
@@ -172,11 +172,14 @@ export default {
 	},
 
 	computed: {
+		isSidebarAvailable() {
+			return this.token && !this.isInLobby
+		},
 		show() {
 			return this.$store.getters.getSidebarStatus
 		},
 		opened() {
-			return !this.isInLobby && this.show
+			return this.isSidebarAvailable && this.show
 		},
 		token() {
 			return this.$store.getters.getToken()