diff --git a/src/components/views/emojipicker/Category.tsx b/src/components/views/emojipicker/Category.tsx
index e77dfeacae6..45ed7144e0d 100644
--- a/src/components/views/emojipicker/Category.tsx
+++ b/src/components/views/emojipicker/Category.tsx
@@ -61,7 +61,7 @@ class Category extends React.PureComponent<IProps> {
                     onClick={onClick}
                     onMouseEnter={onMouseEnter}
                     onMouseLeave={onMouseLeave}
-                    disabled={this.props.isEmojiDisabled(emoji.unicode)}
+                    disabled={this.props.isEmojiDisabled?.(emoji.unicode)}
                 />
             ))
         }</div>);
diff --git a/test/components/views/rooms/SendMessageComposer-test.tsx b/test/components/views/rooms/SendMessageComposer-test.tsx
index 5ab7a1705e5..014f5af66ea 100644
--- a/test/components/views/rooms/SendMessageComposer-test.tsx
+++ b/test/components/views/rooms/SendMessageComposer-test.tsx
@@ -48,21 +48,18 @@ const WrapWithProviders: React.FC<{
 </MatrixClientContext.Provider>;
 
 describe('<SendMessageComposer/>', () => {
-    const defaultRoomContext = {
+    const defaultRoomContext: IRoomState = {
         roomLoading: true,
         peekLoading: false,
         shouldPeek: true,
         membersLoaded: false,
         numUnreadMessages: 0,
-        searching: false,
-        guestsCanJoin: false,
         canPeek: false,
         showApps: false,
         isPeeking: false,
         showRightPanel: true,
         joining: false,
         atEndOfLiveTimeline: true,
-        atEndOfLiveTimelineInit: false,
         showTopUnreadMessagesBar: false,
         statusBarVisible: false,
         canReact: false,
@@ -82,6 +79,9 @@ describe('<SendMessageComposer/>', () => {
         matrixClientIsReady: false,
         timelineRenderingType: TimelineRenderingType.Room,
         liveTimeline: undefined,
+        canSelfRedact: false,
+        resizing: false,
+        narrow: false,
     };
     describe("createMessageContent", () => {
         const permalinkCreator = jest.fn() as any;