diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 931aeaac92a..5d943f65afd 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -29,12 +29,12 @@ export type RoomHeaderProps = {
 			pre?: ReactNode;
 			content?: ReactNode;
 			pos?: ReactNode;
+			hidden?: boolean;
 		};
 	};
-	roomToolbox?: JSX.Element;
 };
 
-const RoomHeader = ({ room, topic = '', slots = {}, roomToolbox }: RoomHeaderProps) => {
+const RoomHeader = ({ room, topic = '', slots = {} }: RoomHeaderProps) => {
 	const { t } = useTranslation();
 
 	return (
@@ -64,13 +64,15 @@ const RoomHeader = ({ room, topic = '', slots = {}, roomToolbox }: RoomHeaderPro
 				)}
 			</HeaderContent>
 			{slots?.posContent}
-			<Suspense fallback={null}>
-				<HeaderToolbar aria-label={t('Toolbox_room_actions')}>
-					{slots?.toolbox?.pre}
-					{slots?.toolbox?.content || roomToolbox || <RoomToolbox />}
-					{slots?.toolbox?.pos}
-				</HeaderToolbar>
-			</Suspense>
+			{slots.toolbox?.hidden !== true && (
+				<Suspense fallback={null}>
+					<HeaderToolbar aria-label={t('Toolbox_room_actions')}>
+						{slots?.toolbox?.pre}
+						{slots?.toolbox?.content || <RoomToolbox />}
+						{slots?.toolbox?.pos}
+					</HeaderToolbar>
+				</Suspense>
+			)}
 			{slots?.end}
 		</Header>
 	);
diff --git a/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
index 9a0a2a3c57d..3e3adc99ba7 100644
--- a/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
@@ -12,7 +12,18 @@ const RoomHeaderE2EESetup = ({ room, slots = {} }: RoomHeaderProps) => {
 	const e2eRoomState = useE2EERoomState(room._id);
 
 	if (e2eeState === 'SAVE_PASSWORD' || e2eeState === 'ENTER_PASSWORD' || e2eRoomState === 'WAITING_KEYS') {
-		return <RoomHeader room={room} slots={slots} roomToolbox={<RoomToolboxE2EESetup />} />;
+		return (
+			<RoomHeader
+				room={room}
+				slots={{
+					...slots,
+					toolbox: {
+						...slots.toolbox,
+						content: <RoomToolboxE2EESetup />,
+					},
+				}}
+			/>
+		);
 	}
 
 	return <RoomHeader room={room} slots={slots} />;
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
index 3fd16776752..711b1471cb6 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
@@ -26,12 +26,12 @@ export type RoomHeaderProps = {
 			pre?: ReactNode;
 			content?: ReactNode;
 			pos?: ReactNode;
+			hidden?: boolean;
 		};
 	};
-	roomToolbox?: JSX.Element;
 };
 
-const RoomHeader = ({ room, slots = {}, roomToolbox }: RoomHeaderProps) => {
+const RoomHeader = ({ room, slots = {} }: RoomHeaderProps) => {
 	const { t } = useTranslation();
 
 	return (
@@ -51,13 +51,15 @@ const RoomHeader = ({ room, slots = {}, roomToolbox }: RoomHeaderProps) => {
 				</HeaderContentRow>
 			</HeaderContent>
 			{slots?.posContent}
-			<Suspense fallback={null}>
-				<HeaderToolbar aria-label={t('Toolbox_room_actions')}>
-					{slots?.toolbox?.pre}
-					{slots?.toolbox?.content || roomToolbox || <RoomToolbox />}
-					{slots?.toolbox?.pos}
-				</HeaderToolbar>
-			</Suspense>
+			{slots.toolbox?.hidden !== true && (
+				<Suspense fallback={null}>
+					<HeaderToolbar aria-label={t('Toolbox_room_actions')}>
+						{slots?.toolbox?.pre}
+						{slots?.toolbox?.content || <RoomToolbox />}
+						{slots?.toolbox?.pos}
+					</HeaderToolbar>
+				</Suspense>
+			)}
 			{slots?.end}
 		</Header>
 	);
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx
index 061f39f6aae..8e45b9239ff 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx
@@ -12,7 +12,16 @@ const RoomHeaderE2EESetup = ({ room }: RoomHeaderProps) => {
 	const e2eRoomState = useE2EERoomState(room._id);
 
 	if (e2eeState === 'SAVE_PASSWORD' || e2eeState === 'ENTER_PASSWORD' || e2eRoomState === 'WAITING_KEYS') {
-		return <RoomHeader room={room} roomToolbox={<RoomToolboxE2EESetup />} />;
+		return (
+			<RoomHeader
+				room={room}
+				slots={{
+					toolbox: {
+						content: <RoomToolboxE2EESetup />,
+					},
+				}}
+			/>
+		);
 	}
 
 	return <RoomHeader room={room} />;