diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 094b92663f..d6e58bbd5c 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -55,6 +55,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
 ### Server
 - Revert: Feat: 이모티콘 중복 체크 (misskey-dev/misskey#11941)
 - Fix: Publish notes announced by relay (misskey-dev/misskey#11056)
+- Fix: 노트 검색 시 로컬/리모트 설정이 제대로 작동하지 않음
 
 ---
 
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index ef84084cda..6e556207e3 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -196,9 +196,9 @@ export class SearchService {
 			const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), pagination.sinceId, pagination.untilId);
 
 			if (opts.origin === 'local') {
-				query.andWhere('note.userHost IS NULL');
+				query.andWhere('user.host IS NULL');
 			} else if (opts.origin === 'remote') {
-				query.andWhere('note.userHost IS NOT NULL');
+				query.andWhere('user.host IS NOT NULL');
 			}
 
 			if (opts.userId) {