diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b3d8d08ca7..83c79d84e4 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -381,7 +381,19 @@ module.exports = React.createClass({
                 var modal = Modal.createDialog(Loader);
 
                 MatrixClientPeg.get().createRoom({
-                    preset: "private_chat"
+                    preset: "private_chat",
+                    // Allow guests by default since the room is private and they'd
+                    // need an invite. This means clicking on a 3pid invite email can
+                    // actually drop you right in to a chat.
+                    initial_state: [
+                        {
+                            content: {
+                                guest_access: 'can_join'
+                            },
+                            type: 'm.room.guest_access',
+                            state_key: '',
+                        }
+                    ],
                 }).done(function(res) {
                     modal.close();
                     dis.dispatch({