diff --git a/src/main/index.ts b/src/main/index.ts
index b5cf3d6f..349589ca 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1030,11 +1030,12 @@ ipcMain.handle('get-cache-hashtags', async (_: IpcMainInvokeEvent) => {
   return tags
 })
 
-ipcMain.on('insert-cache-hashtags', (event: IpcMainEvent, tags: Array<string>) => {
-  tags.map(async name => {
-    await hashtagCache.insertHashtag(name).catch(err => console.error(err))
-  })
-  event.sender.send('response-insert-cache-hashtags')
+ipcMain.handle('insert-cache-hashtags', async (_: IpcMainInvokeEvent, tags: Array<string>) => {
+  await Promise.all(
+    tags.map(async name => {
+      await hashtagCache.insertHashtag(name).catch(err => console.error(err))
+    })
+  )
 })
 
 ipcMain.on('get-cache-accounts', async (event: IpcMainEvent, ownerID: string) => {
diff --git a/src/renderer/store/TimelineSpace/Modals/NewToot/Status.ts b/src/renderer/store/TimelineSpace/Modals/NewToot/Status.ts
index 13056665..37cc159f 100644
--- a/src/renderer/store/TimelineSpace/Modals/NewToot/Status.ts
+++ b/src/renderer/store/TimelineSpace/Modals/NewToot/Status.ts
@@ -223,7 +223,7 @@ const actions: ActionTree<StatusState, RootState> = {
         MUTATION_TYPES.APPEND_FILTERED_HASHTAGS,
         res.data.hashtags.map(tag => tag.name)
       )
-      win.ipcRenderer.send(
+      await win.ipcRenderer.invoke(
         'insert-cache-hashtags',
         res.data.hashtags.map(tag => tag.name)
       )