diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index a05bae30c2..82eeef111d 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -104,7 +104,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         const restrictedRoomCapabilities = SpaceStore.instance.restrictedJoinRuleSupport;
         const roomSupportsRestricted = Array.isArray(restrictedRoomCapabilities?.support)
             && restrictedRoomCapabilities.support.includes(room.getVersion());
-        const preferredRestrictionVersion = roomSupportsRestricted ? null : restrictedRoomCapabilities.preferred;
+        const preferredRestrictionVersion = roomSupportsRestricted ? undefined : restrictedRoomCapabilities?.preferred;
         this.setState({ joinRule, restrictedAllowRoomIds, guestAccess, history, encrypted,
             roomSupportsRestricted, preferredRestrictionVersion });
 
diff --git a/src/createRoom.ts b/src/createRoom.ts
index e809f5ff0a..24c5dc513a 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -144,19 +144,19 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
     }
 
     if (opts.parentSpace) {
-        opts.createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true));
-        opts.createOpts.initial_state.push({
+        createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true));
+        createOpts.initial_state.push({
             type: EventType.RoomHistoryVisibility,
             content: {
-                "history_visibility": opts.createOpts.preset === Preset.PublicChat ? "world_readable" : "invited",
+                "history_visibility": createOpts.preset === Preset.PublicChat ? "world_readable" : "invited",
             },
         });
 
         if (opts.joinRule === JoinRule.Restricted) {
             if (SpaceStore.instance.restrictedJoinRuleSupport?.preferred) {
-                opts.createOpts.room_version = SpaceStore.instance.restrictedJoinRuleSupport.preferred;
+                createOpts.room_version = SpaceStore.instance.restrictedJoinRuleSupport.preferred;
 
-                opts.createOpts.initial_state.push({
+                createOpts.initial_state.push({
                     type: EventType.RoomJoinRules,
                     content: {
                         "join_rule": JoinRule.Restricted,
@@ -171,7 +171,7 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
     }
 
     if (opts.joinRule !== JoinRule.Restricted) {
-        opts.createOpts.initial_state.push({
+        createOpts.initial_state.push({
             type: EventType.RoomJoinRules,
             content: { join_rule: opts.joinRule },
         });