diff --git a/phpBB/phpbb/textreparser/plugins/poll_title.php b/phpBB/phpbb/textreparser/plugins/poll_title.php
index 76d30655c9..5ca8bb063b 100644
--- a/phpBB/phpbb/textreparser/plugins/poll_title.php
+++ b/phpBB/phpbb/textreparser/plugins/poll_title.php
@@ -34,7 +34,7 @@ class poll_title extends \phpbb\textreparser\row_based_plugin
 		$sql = 'SELECT t.topic_id AS id, t.poll_title AS text, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.bbcode_uid
 			FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
 			WHERE t.topic_id BETWEEN ' . $min_id . ' AND ' . $max_id .'
-				AND t.poll_max_options > 0
+				AND t.poll_start > 0
 				AND p.post_id = t.topic_first_post_id';
 
 		return $sql;
diff --git a/tests/text_reparser/plugins/fixtures/polls.xml b/tests/text_reparser/plugins/fixtures/polls.xml
index 2960d640a9..5247fb906d 100644
--- a/tests/text_reparser/plugins/fixtures/polls.xml
+++ b/tests/text_reparser/plugins/fixtures/polls.xml
@@ -44,55 +44,66 @@
 		<column>topic_id</column>
 		<column>topic_first_post_id</column>
 		<column>poll_title</column>
+		<column>poll_start</column>
 		<row>
 			<value>1</value>
 			<value>1</value>
 			<value>This row should be [b]ignored[/b]</value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>1</value>
 			<value>[b]Not bold[/b] :) http://example.org</value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>2</value>
 			<value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>3</value>
 			<value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>5</value>
 			<value>4</value>
 			<value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>6</value>
 			<value>2</value>
 			<value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>7</value>
 			<value>1</value>
 			<value><![CDATA[[flash=123,345]http://example.org/flash.swf[/flash]]]></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>8</value>
 			<value>2</value>
 			<value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>9</value>
 			<value>1</value>
 			<value><![CDATA[[img]http://example.org/img.png[/img]]]></value>
+			<value>1</value>
 		</row>
 		<row>
 			<value>1000</value>
 			<value>1</value>
 			<value>This row should be [b]ignored[/b]</value>
+			<value>1</value>
 		</row>
 	</table>
 </dataset>