diff --git a/faq-bundle/src/Resources/contao/modules/ModuleFaqPage.php b/faq-bundle/src/Resources/contao/modules/ModuleFaqPage.php
index 1748ea9c9ea..b188a3eb82a 100644
--- a/faq-bundle/src/Resources/contao/modules/ModuleFaqPage.php
+++ b/faq-bundle/src/Resources/contao/modules/ModuleFaqPage.php
@@ -74,9 +74,9 @@ public function generate()
 	 */
 	protected function compile()
 	{
-		$objFaq = FaqModel::findPublishedByPids($this->faq_categories);
+		$objFaqs = FaqModel::findPublishedByPids($this->faq_categories);
 
-		if ($objFaq === null)
+		if ($objFaqs === null)
 		{
 			$this->Template->faq = array();
 
@@ -90,7 +90,7 @@ protected function compile()
 		$arrFaqs = array_fill_keys($this->faq_categories, array());
 
 		// Add FAQs
-		while ($objFaq->next())
+		foreach ($objFaqs as $objFaq)
 		{
 			/** @var FaqModel $objFaq */
 			$objTemp = (object) $objFaq->row();