diff --git a/src/server/api/endpoints/clips/notes.ts b/src/server/api/endpoints/clips/notes.ts
index 5289533a1..3d66623d6 100644
--- a/src/server/api/endpoints/clips/notes.ts
+++ b/src/server/api/endpoints/clips/notes.ts
@@ -45,13 +45,16 @@ export const meta = {
 export default define(meta, async (ps, user) => {
 	const clip = await Clips.findOne({
 		id: ps.clipId,
-		userId: user.id
 	});
 
 	if (clip == null) {
 		throw new ApiError(meta.errors.noSuchClip);
 	}
 
+	if (!clip.isPublic && (clip.userId !== user.id)) {
+		throw new ApiError(meta.errors.noSuchClip);
+	}
+
 	const clipQuery = ClipNotes.createQueryBuilder('joining')
 		.select('joining.noteId')
 		.where('joining.clipId = :clipId', { clipId: clip.id });
diff --git a/src/server/api/endpoints/clips/show.ts b/src/server/api/endpoints/clips/show.ts
index 5b2b7b7d5..1d4947528 100644
--- a/src/server/api/endpoints/clips/show.ts
+++ b/src/server/api/endpoints/clips/show.ts
@@ -30,12 +30,15 @@ export default define(meta, async (ps, me) => {
 	// Fetch the clip
 	const clip = await Clips.findOne({
 		id: ps.clipId,
-		userId: me.id,
 	});
 
 	if (clip == null) {
 		throw new ApiError(meta.errors.noSuchClip);
 	}
 
+	if (!clip.isPublic && (clip.userId !== me.id)) {
+		throw new ApiError(meta.errors.noSuchClip);
+	}
+
 	return await Clips.pack(clip);
 });