diff --git a/application/controllers/admin/checkintegrity.php b/application/controllers/admin/checkintegrity.php
index d6dd281c7b9..015cf460fd2 100644
--- a/application/controllers/admin/checkintegrity.php
+++ b/application/controllers/admin/checkintegrity.php
@@ -435,15 +435,11 @@ protected function _checkintegrity()
         /**********************************************************************/
         /*     Check question attributes                                      */
         /**********************************************************************/
-        $question_attributes = Question_attributes::model()->findAll();
+        $question_attributes = Question_attributes::model()->findAllBySql('select qid from {{question_attributes}} where qid not in (select qid from {{questions}})');
         if (Question_attributes::model()->hasErrors()) safeDie(Question_attributes::model()->getError());
         foreach ($question_attributes as $question_attribute)
         {
-            $iRowCount = Questions::model()->countByAttributes(array('qid' => $question_attribute['qid']));
-            if (Questions::model()->hasErrors()) safeDie(Questions::model()->getError());
-            if (!$iRowCount) {
-                $aDelete['questionattributes'][] = array('qid' => $question_attribute['qid']);
-            }
+            $aDelete['questionattributes'][] = array('qid' => $question_attribute['qid']);
         } // foreach