diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html
index 26598c7c2b..1118a1f32e 100644
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -18,11 +18,13 @@
 	<tr>
 		<th colspan="3">{L_QUESTIONS}</th>
 	</tr>
+	{% if questions %}
 	<tr class="row3">
 		<td style="text-align: center;">{L_QUESTION_TEXT}</td>
 		<td style="width: 5%; text-align: center;">{L_QUESTION_LANG}</td>
 		<td style="vertical-align: top; width: 50px; text-align: center; white-space: nowrap;">{L_ACTION}</td>
 	</tr>
+	{% endif %}
 	</thead>
 
 	<tbody>
@@ -33,6 +35,10 @@
 			<td style="text-align: center;">{{ question.QUESTION_LANG }}</td>
 			<td style="text-align: center;"><a href="{{ question.U_EDIT }}">{{ ICON_EDIT }}</a> <a href="{{ question.U_DELETE }}">{{ ICON_DELETE }}</a></td>
 		</tr>
+	{% else %}
+		<tr>
+			<td class="row3 centered-text" colspan="3">{{ lang('QA_NO_QUESTIONS') }}</td>
+		</tr>
 	{% endfor %}
 	</tbody>
 
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
index 637c4e035e..b883166159 100644
--- a/phpBB/language/en/captcha_qa.php
+++ b/phpBB/language/en/captcha_qa.php
@@ -61,4 +61,5 @@ $lang = array_merge($lang, array(
 
 	'QA_ERROR_MSG'				=> 'Please fill in all fields and enter at least one answer.',
 	'QA_LAST_QUESTION'			=> 'You cannot delete all questions while the plugin is active.',
+	'QA_NO_QUESTIONS'			=> 'There are no questions yet.',
 ));