diff --git a/application/models/QuestionAttribute.php b/application/models/QuestionAttribute.php
index cac3933b580..7de2a72de66 100644
--- a/application/models/QuestionAttribute.php
+++ b/application/models/QuestionAttribute.php
@@ -218,7 +218,7 @@ public function getQuestionAttributes($iQuestionID, $sLanguage = null)
 
         // Limit the size of the attribute cache due to memory usage
         $aQuestionAttributes = array();
-        $oQuestion = Question::model()->find("qid=:qid", array('qid'=>$iQuestionID)); // Maybe take parent_qid attribute before this qid attribute
+        $oQuestion = Question::model()->with('survey')->find("qid=:qid", array('qid'=>$iQuestionID)); // Maybe take parent_qid attribute before this qid attribute
 
         if ($oQuestion) {
             if ($sLanguage) {
@@ -237,7 +237,7 @@ public function getQuestionAttributes($iQuestionID, $sLanguage = null)
             $aAttributeNames = self::getQuestionAttributesSettings($sType);
 
             /* Get whole existing attribute for this question in an array*/
-            $oAttributeValues = self::model()->findAll("qid=:qid", array('qid'=>$iQuestionID));
+            $oAttributeValues = self::model()->resetScope()->findAll("qid=:qid", ['qid' => $iQuestionID]);
 
             // insert additional attributes from an extended question theme
             foreach ($oAttributeValues as $oAttributeValue) {
diff --git a/application/models/QuestionBaseDataSet.php b/application/models/QuestionBaseDataSet.php
index fbbff6537e2..9d5f907836e 100644
--- a/application/models/QuestionBaseDataSet.php
+++ b/application/models/QuestionBaseDataSet.php
@@ -115,7 +115,7 @@ public function getAdvancedOptions($iQuestionID = null, $sQuestionType = null, $
         
         $this->sQuestionType = $sQuestionType == null ? $this->oQuestion->type : $sQuestionType;
         $this->sLanguage = $sLanguage == null ? $this->oQuestion->survey->language : $sLanguage;
-        $this->aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($this->oQuestion->qid, $this->sLanguage);
+        $this->aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($this->oQuestion->qid, $sLanguage);
         
         $sQuestionType = $this->sQuestionType;