diff --git a/Sources/Poll.php b/Sources/Poll.php
index 7907c77bc3..3aa24e7778 100644
--- a/Sources/Poll.php
+++ b/Sources/Poll.php
@@ -1059,15 +1059,11 @@ protected function initNewPoll(): void
 			'guest_vote' => !empty($_POST['poll_guest_vote']),
 		]);
 
-		// Make all five poll choices empty.
-		Utils::$context['last_choice_id'] = 4;
-
-		for ($i = 0; $i <= Utils::$context['last_choice_id']; $i++) {
+		for ($i = 0; $i <= 4; $i++) {
 			$this->addChoice([
 				'id' => $i,
 				'number' => $i + 1,
 				'label' => '',
-				'is_last' => $i === Utils::$context['last_choice_id'],
 			], true);
 		}
 	}