diff --git a/src/components/RoomNameInput.js b/src/components/RoomNameInput.js
index 93cc067354c9..5d1042be3ebd 100644
--- a/src/components/RoomNameInput.js
+++ b/src/components/RoomNameInput.js
@@ -80,6 +80,11 @@ class RoomNameInput extends Component {
         if (prevState.error !== this.state.error) {
             this.props.onChangeError(this.state.error);
         }
+
+        // If the selected policyID has changed we need to check if the room name already exists on this new policy.
+        if (prevProps.policyID !== this.props.policyID) {
+            this.checkAndModifyRoomName(this.state.roomName);
+        }
     }
 
     /**
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 5dd692e82596..829af0e6c2fe 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -115,7 +115,8 @@ class WorkspaceNewRoomPage extends React.Component {
                         <View style={styles.mb5}>
                             <Text style={[styles.formLabel]}>{this.props.translate('newRoomPage.roomName')}</Text>
                             <RoomNameInput
-                                onChangeText={(roomName) => { this.setState({roomName}); }}
+                                onChangeText={roomName => this.setState({roomName})}
+                                onChangeError={error => this.setState({error})}
                                 initialValue={this.state.roomName}
                                 policyID={this.state.policyID}
                             />