diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 1ab5f094ee..e28f356922 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -62,16 +62,15 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 		}) as IRemoteUser;
 	}
 
-	// Update activityの場合は、ここで署名検証/更新処理まで実施して終了
-	if (activity.type === 'Update') {
-		if (activity.object && activity.object.type === 'Person') {
-			if (user == null) {
-				console.warn('Update activity received, but user not registed.');
-			} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
-				console.warn('Update activity received, but signature verification failed.');
-			} else {
-				updatePerson(activity.actor, null, activity.object);
-			}
+	// Update<Person> activityの場合は、ここで署名検証/更新処理まで実施して終了
+	if (activity.type === 'Update'
+		&& activity.object && activity.object.type === 'Person') {
+		if (user == null) {
+			console.warn('Update activity received, but user not registed.');
+		} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
+			console.warn('Update activity received, but signature verification failed.');
+		} else {
+			updatePerson(activity.actor, null, activity.object);
 		}
 		done();
 		return;
diff --git a/src/remote/activitypub/kernel/index.ts b/src/remote/activitypub/kernel/index.ts
index 61bb89f5e9..b7ac358cfc 100644
--- a/src/remote/activitypub/kernel/index.ts
+++ b/src/remote/activitypub/kernel/index.ts
@@ -11,6 +11,7 @@ import reject from './reject';
 import add from './add';
 import remove from './remove';
 import block from './block';
+import update from './update';
 
 const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 	switch (activity.type) {
@@ -58,6 +59,10 @@ const self = async (actor: IRemoteUser, activity: Object): Promise<void> => {
 		await block(actor, activity);
 		break;
 
+	case 'Update':
+		await update(actor, activity);
+		break;
+
 	case 'Collection':
 	case 'OrderedCollection':
 		// TODO
diff --git a/src/remote/activitypub/kernel/update/index.ts b/src/remote/activitypub/kernel/update/index.ts
new file mode 100644
index 0000000000..b3c68ab6da
--- /dev/null
+++ b/src/remote/activitypub/kernel/update/index.ts
@@ -0,0 +1,34 @@
+import { IRemoteUser } from '../../../../models/user';
+import * as debug from 'debug';
+import { IUpdate } from '../../type';
+import { extractPollFromQuestion } from '../../models/question';
+import Note from '../../../../models/note';
+
+const log = debug('misskey:activitypub');
+
+export default async (actor: IRemoteUser, activity: IUpdate): Promise<void> => {
+	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
+	const type = (activity.object as any).type;
+
+	log(`Update<${type}>: ${id}`);
+
+	switch (type) {
+		case 'Question':
+			const note = await Note.findOne({
+				questionUri: id
+			});
+
+			if (note === null) throw 'note not found';
+
+			const poll = await extractPollFromQuestion(id);
+
+			await Note.update({
+				_id: note._id
+			}, {
+				$set: {
+					poll
+				}
+			});
+			break;
+	}
+};