diff --git a/app/javascript/components/rooms/room/FeatureTabs.jsx b/app/javascript/components/rooms/room/FeatureTabs.jsx
index 8071cd2074..3d4656761c 100644
--- a/app/javascript/components/rooms/room/FeatureTabs.jsx
+++ b/app/javascript/components/rooms/room/FeatureTabs.jsx
@@ -52,7 +52,7 @@ export default function FeatureTabs() {
   const showRecTabs = (recordValue !== 'false');
 
   return (
-    <Tabs className="wide-white pt-4 mx-0" defaultActiveKey={showRecTabs ? 'recordings' : 'presentation'} unmountOnExit>
+    <Tabs className="wide-white pt-4 mx-0" defaultActiveKey='settings' unmountOnExit>
       {showRecTabs
         && (
           <Tab className="background-whitesmoke" eventKey="recordings" title={t('recording.recordings')}>
diff --git a/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx b/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
index 159f8ed303..8088ce36b1 100644
--- a/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
+++ b/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
@@ -119,7 +119,7 @@ export default function RoomSettings() {
               <div className="float-end mt-3">
                 <Stack direction="horizontal" gap={2}>
                   {
-                    room.shared
+                    room?.shared
                       && (
                         <Modal
                           modalButton={(
@@ -134,7 +134,7 @@ export default function RoomSettings() {
                       )
                   }
                   {
-                    (!room.shared || currentUser?.permissions?.ManageRooms === 'true')
+                    (!room?.shared || currentUser?.permissions?.ManageRooms === 'true')
                       && (
                         <Modal
                           modalButton={(
diff --git a/app/javascript/components/rooms/room/room_settings/forms/UpdateRoomNameForm.jsx b/app/javascript/components/rooms/room/room_settings/forms/UpdateRoomNameForm.jsx
index 9abfb047cd..2459d7a463 100644
--- a/app/javascript/components/rooms/room/room_settings/forms/UpdateRoomNameForm.jsx
+++ b/app/javascript/components/rooms/room/room_settings/forms/UpdateRoomNameForm.jsx
@@ -40,7 +40,7 @@ export default function UpdateRoomNameForm({ friendlyId }) {
       <h6 className="text-brand">{ t('room.room_name') }</h6>
       <Form onSubmit={handleSubmit(updateRoom.mutate)}>
         <Stack direction="horizontal">
-          <Form.Control type="text" defaultValue={room.name} {...register('room.name', { minLength: 2, maxLength: 255 })} />
+          <Form.Control type="text" defaultValue={room?.name} {...register('room.name', { minLength: 2, maxLength: 255 })} />
           <Button type="submit" variant="brand" className="ms-3"> { t('update') } </Button>
         </Stack>
       </Form>