diff --git a/src/server/api/endpoints/notes/polls/vote.ts b/src/server/api/endpoints/notes/polls/vote.ts
index 9cf65dcd7e..78dd1d1ff7 100644
--- a/src/server/api/endpoints/notes/polls/vote.ts
+++ b/src/server/api/endpoints/notes/polls/vote.ts
@@ -1,7 +1,12 @@
 import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
+import Vote from '../../../../../models/poll-vote';
 import Note from '../../../../../models/note';
+import Watching from '../../../../../models/note-watching';
+import watch from '../../../../../services/note/watch';
+import { publishNoteStream } from '../../../../../stream';
+import notify from '../../../../../notify';
 import define from '../../../define';
-import vote from '../../../../../services/note/polls/vote';
+import createNote from '../../../../../services/note/create';
 
 export const meta = {
 	desc: {
@@ -43,5 +48,80 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 		return rej('poll not found');
 	}
 
-	await vote(user, note, ps.choice).catch(e => rej(e));
+	if (!note.poll.choices.some(x => x.id == ps.choice)) return rej('invalid choice param');
+
+	// if already voted
+	const exist = await Vote.findOne({
+		noteId: note._id,
+		userId: user._id
+	});
+
+	if (exist !== null) {
+		return rej('already voted');
+	}
+
+	// Create vote
+	await Vote.insert({
+		createdAt: new Date(),
+		noteId: note._id,
+		userId: user._id,
+		choice: ps.choice
+	});
+
+	// Send response
+	res();
+
+	const inc: any = {};
+	inc[`poll.choices.${note.poll.choices.findIndex(c => c.id == ps.choice)}.votes`] = 1;
+
+	// Increment votes count
+	await Note.update({ _id: note._id }, {
+		$inc: inc
+	});
+
+	publishNoteStream(note._id, 'pollVoted', {
+		choice: ps.choice,
+		userId: user._id.toHexString()
+	});
+
+	// Notify
+	notify(note.userId, user._id, 'poll_vote', {
+		noteId: note._id,
+		choice: ps.choice
+	});
+
+	// Fetch watchers
+	Watching
+		.find({
+			noteId: note._id,
+			userId: { $ne: user._id },
+			// 削除されたドキュメントは除く
+			deletedAt: { $exists: false }
+		}, {
+			fields: {
+				userId: true
+			}
+		})
+		.then(watchers => {
+			for (const watcher of watchers) {
+				notify(watcher.userId, user._id, 'poll_vote', {
+					noteId: note._id,
+					choice: ps.choice
+				});
+			}
+		});
+
+	// この投稿をWatchする
+	if (user.settings.autoWatch !== false) {
+		watch(user._id, note);
+	}
+
+	// リモート投票の場合リプライ送信
+	if (note._user.host != null) {
+		createNote(user, {
+			createdAt: new Date(),
+			text: ps.choice.toString(),
+			reply: note,
+		});
+	}
 }));