diff --git a/features/GroupInvites/joinGroup/JoinGroup.client.ts b/features/GroupInvites/joinGroup/JoinGroup.client.ts
index 4de3b7f61..0f7e11fcd 100644
--- a/features/GroupInvites/joinGroup/JoinGroup.client.ts
+++ b/features/GroupInvites/joinGroup/JoinGroup.client.ts
@@ -24,6 +24,7 @@ import {} from "../groupInvites.utils";
 import { JoinGroupResult } from "./joinGroup.types";
 import { ConversationListQueryData } from "@/queries/useConversationListQuery";
 import { entify } from "@/queries/entify";
+import { wait } from "@/utils/wait";
 
 const GROUP_JOIN_REQUEST_POLL_MAX_ATTEMPTS = 10;
 const GROUP_JOIN_REQUEST_POLL_INTERVAL_MS = 1000;
diff --git a/features/conversation/hooks/use-send-message.ts b/features/conversation/hooks/use-send-message.ts
index b6e9c4d93..f29f649bb 100644
--- a/features/conversation/hooks/use-send-message.ts
+++ b/features/conversation/hooks/use-send-message.ts
@@ -82,7 +82,7 @@ export function useSendMessage(props: {
           // @ts-ignore we're adding our "own" delivery status because we want to display it in the UI
           deliveryStatus: "sending" satisfies IConversationMessageStatus,
           topic: conversation.topic,
-          senderAddress: currentUserInboxId,
+          senderInboxId: currentUserInboxId,
           nativeContent: {},
           content: () => {
             return variables.content.text!;