diff --git a/src/components/structures/MessagePanel.tsx b/src/components/structures/MessagePanel.tsx
index fb6b3150d496..69efa38c9bc0 100644
--- a/src/components/structures/MessagePanel.tsx
+++ b/src/components/structures/MessagePanel.tsx
@@ -445,9 +445,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
                 }
                 const eventId = event.getId()!;
                 if (previousEventId && eventId === currentEventId) {
-                    console.log('.mx_EventTile[data-event-id="' + previousEventId + '"]');
-
-                    document.querySelector('.mx_EventTile[data-event-id="' + previousEventId + '"]')?.focus();
+                    document.querySelector<HTMLElement>('.mx_EventTile[data-event-id="' + previousEventId + '"]')?.focus();
                     this.focusedEventId = previousEventId;
                     ev.preventDefault();
                     return;
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index ce539e7f8719..4197fe3395de 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -311,9 +311,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
         const navAction = getKeyBindingsManager().getNavigationAction(event);
         switch (navAction) {
             case KeyBindingAction.SelectPrevMessage:
-                (
-                    document.querySelector(".mx_EventTile_selected") || document.querySelector(".mx_EventTile_last")
-                )?.focus();
+                document.querySelector<HTMLElement>(".mx_EventTile_selected,.mx_EventTile_last")?.focus();
                 event.preventDefault();
                 event.stopPropagation();
                 return;