--- application/helpers/qanda_helper.php    15:48:19.000000000 +0200
+++ application/helpers/qanda_helper.php	2018-09-25 18:05:36.587042790 +0200
@@ -801,9 +801,6 @@
     if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) {
 // Add "No Answer" option if question is not mandatory
         $checkedState = '';
-        if (!$_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]]) {
-            $checkedState = ' CHECKED ';
-        }
         $aRows[] = array(
             'name'                   => $ia[1],
             'value'                  => "",
@@ -1578,11 +1575,7 @@
     if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {
         $iRowCount++;
 
-        if ((!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] == '') || ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] == ' ')) {
-            $check_ans = CHECKED; //Check the "no answer" radio button if there is no answer in session.
-        } else {
-            $check_ans = '';
-        }
+        $check_ans = '';
 
         if ($iRowCount == 1) {
             $sRows .= doRender('/survey/questions/answer/listradio/columns/column_header', array('iColumnWidth' => $iColumnWidth), true);
@@ -4156,7 +4149,7 @@
             $fn++;
 
             foreach ($labelcode as $ld) {
-                $CHECKED     = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == $ld) ? 'CHECKED' : '';
+                $CHECKED     = ($ld != "" && isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == $ld) ? 'CHECKED' : '';
                 $answer_tds .= doRender('/survey/questions/answer/arrays/array/no_dropdown/rows/cells/answer_td', array(
                     'myfname'=>$myfname,
                     'ld'=>$ld,
@@ -4170,7 +4163,7 @@
             // NB: $ia[6] = mandatory
             $no_answer_td = '';
             if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {
-                $CHECKED = (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '') ? 'CHECKED' : '';
+                $CHECKED = '';
                 $no_answer_td .= doRender('/survey/questions/answer/arrays/array/no_dropdown/rows/cells/answer_td', array(
                     'myfname'                => $myfname,
                     'ld'                     => '',