diff --git a/src/main/kotlin/dev/usbharu/hideout/service/ap/APNoteService.kt b/src/main/kotlin/dev/usbharu/hideout/service/ap/APNoteService.kt
index 2cf9d080..a0b76dcb 100644
--- a/src/main/kotlin/dev/usbharu/hideout/service/ap/APNoteService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/service/ap/APNoteService.kt
@@ -119,8 +119,12 @@ class APNoteServiceImpl(
         targetActor: String?,
         url: String
     ): Note {
+        if (note.id == null) {
+            return internalNote(note, targetActor, url)
+        }
+
         val findByApId = try {
-            postQueryService.findByApId(url)
+            postQueryService.findByApId(note.id!!)
         } catch (_: NoSuchElementException) {
             return internalNote(note, targetActor, url)
         } catch (_: IllegalArgumentException) {