diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
index b9c38411c9..817a037397 100644
--- a/packages/backend/src/core/AccountMoveService.ts
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -94,11 +94,11 @@ export class AccountMoveService {
 
 		// Unfollow
 		const followings = await this.followingsRepository.findBy({
-			followeeId: src.id,
+			followerId: src.id,
 		});
 		this.queueService.createUnfollowJob(followings.map(following => ({
 			from: { id: src.id },
-			to: { id: following.followerId },
+			to: { id: following.followeeId },
 		})));
 
 		// Move!
@@ -120,7 +120,7 @@ export class AccountMoveService {
 			/* skip if any error happens */
 		}
 
-		// follow the new account and unfollow the old one
+		// follow the new account
 		const proxy = await this.proxyAccountService.fetch();
 		const followings = await this.followingsRepository.findBy({
 			followeeId: src.id,
diff --git a/packages/backend/test/e2e/move.ts b/packages/backend/test/e2e/move.ts
index 740d634a2c..d589654dcd 100644
--- a/packages/backend/test/e2e/move.ts
+++ b/packages/backend/test/e2e/move.ts
@@ -264,7 +264,7 @@ describe('Account Move', () => {
 
 			assert.strictEqual(move.status, 200);
 
-			await sleep(1000 * 1); // wait for jobs to finish
+			await sleep(1000 * 3); // wait for jobs to finish
 
 			const aliceFollowings = await api('/users/following', {
 				userId: alice.id,