diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 893564b325..17be9a5e0f 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -163,6 +163,7 @@ function createSelfRoomMembershipAction(matrixClient, membershipEvent, member, o
     if (member.userId === matrixClient.getUserId()) {
         return { action: 'MatrixActions.Room.selfMembership', member };
     }
+    return null;
 }
 
 /**