diff --git a/index.js b/index.js
index 907f36e..ea552fe 100644
--- a/index.js
+++ b/index.js
@@ -41,6 +41,9 @@ async function matrixEventHandler(request, context) {
                 tmiClient.disconnect();
             });
         });
+    } else if(event.content.membership === 'invite' && event.state_key === '@'+bridge.opts.registration.sender_localpart+':'+bridge.opts.domain) {
+        // auto-join on invite
+        bridge.getIntent().join(event.room_id);
     }
 };