diff --git a/main/exercise/answer.class.php b/main/exercise/answer.class.php
index 900467a62c..adb2d45e8d 100755
--- a/main/exercise/answer.class.php
+++ b/main/exercise/answer.class.php
@@ -650,7 +650,14 @@ class Answer
                         $answer->read();
 
                         $correctAnswerId = $answer->selectAnswerIdByPosition($correct);
-                        $correctAnswerAutoId = $answer->selectAutoId($correctAnswerId);
+
+						// Continue to avoid matching question bug if $correctAnswerId returns false
+						// See : https://support.chamilo.org/issues/8334
+						if ($questionType == MATCHING && !$correctAnswerId) {
+							continue;
+						}
+
+                        $correctAnswerAutoId = $answer->selectAutoId($correct);
 
                         Database::update(
                             $answerTable,