diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
index 67b943f8c09..36488e2c67f 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
@@ -46,7 +46,8 @@
 				</NcButton>
 				<NcActions v-if="canModerate"
 					:container="container"
-					:force-menu="true">
+					:inline="showAssistanceButton ? 1 : 0"
+					:force-menu="!showAssistanceButton">
 					<NcActionButton v-if="showAssistanceButton"
 						@click="dismissRequestAssistance">
 						<template #icon>
diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
index cd255048875..888d9aef5ca 100644
--- a/src/components/TopBar/TopBarMenu.vue
+++ b/src/components/TopBar/TopBarMenu.vue
@@ -379,8 +379,7 @@ export default {
 		// True if current conversation is a breakout room and the breakout room has started
 		// And a call is in progress
 		userIsInBreakoutRoomAndInCall() {
-			return this.conversation.breakoutRoomMode === CONVERSATION.BREAKOUT_ROOM_MODE.NOT_CONFIGURED
-				&& this.conversation.breakoutRoomStatus === CONVERSATION.BREAKOUT_ROOM_STATUS.STARTED
+			return this.conversation.objectType === CONVERSATION.OBJECT_TYPE.BREAKOUT_ROOM
 				&& this.isInCall
 		},
 	},
@@ -468,9 +467,9 @@ export default {
 			// If the current conversation is a break-out room and the user is not a moderator,
 			// also send request for assistance to the moderators.
 			if (this.userIsInBreakoutRoomAndInCall && !this.canModerate) {
-				this.$store.dispatch('requestAssistanceAction', {
-					token: this.token,
-				})
+				if (newState) {
+					this.$store.dispatch('requestAssistanceAction', { token: this.token })
+				}
 			}
 		},
 
diff --git a/src/store/breakoutRoomsStore.js b/src/store/breakoutRoomsStore.js
index d4863105e2b..32f959ee282 100644
--- a/src/store/breakoutRoomsStore.js
+++ b/src/store/breakoutRoomsStore.js
@@ -221,6 +221,10 @@ const actions = {
 			const response = await requestAssistance(token)
 			// Add the updated parent conversation to the conversations store
 			context.commit('addConversation', response.data.ocs.data)
+			context.commit('addBreakoutRoom', {
+				parentRoomToken: response.data.ocs.data.objectId,
+				breakoutRoom: response.data.ocs.data,
+			})
 		} catch (error) {
 			console.error(error)
 			showError(t('spreed', 'An error occurred while requesting assistance'))
@@ -232,6 +236,10 @@ const actions = {
 			const response = await resetRequestAssistance(token)
 			// Add the updated parent conversation to the conversations store
 			context.commit('addConversation', response.data.ocs.data)
+			context.commit('addBreakoutRoom', {
+				parentRoomToken: response.data.ocs.data.objectId,
+				breakoutRoom: response.data.ocs.data,
+			})
 		} catch (error) {
 			console.error(error)
 			showError(t('spreed', 'An error occurred while resetting the request for assistance'))
diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index 07b736e523c..800ad5c9c90 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -385,6 +385,13 @@ const actions = {
 				const conversationHasChanged = context.dispatch('updateConversationIfHasChanged', newConversation)
 				storeHasChanged = conversationHasChanged || storeHasChanged
 			}
+
+			if (newConversation.objectType === CONVERSATION.OBJECT_TYPE.BREAKOUT_ROOM) {
+				context.commit('addBreakoutRoom', {
+					parentRoomToken: newConversation.objectId,
+					breakoutRoom: newConversation,
+				})
+			}
 		}
 
 		if (withCaching && storeHasChanged) {