diff --git a/src/button/RaisedHandToggleButton.tsx b/src/button/RaisedHandToggleButton.tsx
index 72f15a7b..1f5d292e 100644
--- a/src/button/RaisedHandToggleButton.tsx
+++ b/src/button/RaisedHandToggleButton.tsx
@@ -53,13 +53,11 @@ const InnerButton: FC<InnerButtonButtonProps> = ({ raised, ...props }) => {
 };
 
 interface RaisedHandToggleButton {
-  key: string;
   rtcSession: MatrixRTCSession;
   client: MatrixClient;
 }
 
 export function RaiseHandToggleButton({
-  key,
   client,
   rtcSession,
 }: RaisedHandToggleButton): ReactNode {
@@ -135,7 +133,6 @@ export function RaiseHandToggleButton({
 
   return (
     <InnerButton
-      key={key}
       disabled={busy}
       onClick={toggleRaisedHand}
       raised={isHandRaised}
diff --git a/src/useReactions.tsx b/src/useReactions.tsx
index 5db015a4..623d497a 100644
--- a/src/useReactions.tsx
+++ b/src/useReactions.tsx
@@ -114,7 +114,10 @@ export const ReactionsProvider = ({
       if (!m.sender || !m.eventId) {
         continue;
       }
-      if (raisedHands[m.sender].parentEventId !== m.eventId) {
+      if (
+        raisedHands[m.sender] &&
+        raisedHands[m.sender].parentEventId !== m.eventId
+      ) {
         // Membership event for sender has changed.
         removeRaisedHand(m.sender);
       }
@@ -133,9 +136,9 @@ export const ReactionsProvider = ({
         }
       }
     }
-    // Deliberately ignoring addRaisedHand which was causing looping.
+    // Deliberately ignoring addRaisedHand, raisedHands which was causing looping.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [raisedHands, room, memberships]);
+  }, [room, memberships]);
 
   useEffect(() => {
     const handleReactionEvent = (event: MatrixEvent): void => {
@@ -174,7 +177,7 @@ export const ReactionsProvider = ({
       Object.fromEntries(
         Object.entries(raisedHands).map(([uid, data]) => [uid, data.time]),
       ),
-    [raisedHands],
+    [raisedHands, raisedHandCount],
   );
 
   return (