diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 9e2a261f78..e020ef2f99 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -189,6 +189,7 @@ watch(cachedNote, async () => {
 		overridingNote.value = {};
 		return;
 	}
+	isDeleted.value = false;
 	if (noteViewInterruptors.length > 0) {
 		overridingNote.value = {};
 		return;
diff --git a/packages/frontend/src/scripts/entity-manager.ts b/packages/frontend/src/scripts/entity-manager.ts
index d54a703e52..461cb6bf44 100644
--- a/packages/frontend/src/scripts/entity-manager.ts
+++ b/packages/frontend/src/scripts/entity-manager.ts
@@ -103,10 +103,10 @@ export class NoteManager {
 
     public get(id: string): CachedNote {
         if (!this.notesComputed.has(id)) {
-            const note = this.notesSource.get(id);
+            const note = this.notesSource.get(id) ?? this.notesSource.set(id, ref(null)).get(id)!;
 
             this.notesComputed.set(id, computed<Note | null>(() => {
-                if (!note || !note.value) return null;
+                if (!note.value) return null;
 
                 const user = userLiteManager.get(note.value.userId)!;