diff --git a/src/core/question/classes/base-question-component.ts b/src/core/question/classes/base-question-component.ts
index f0ab76a35..c1a7d8b85 100644
--- a/src/core/question/classes/base-question-component.ts
+++ b/src/core/question/classes/base-question-component.ts
@@ -481,11 +481,6 @@ export class CoreQuestionBaseComponent {
 
                 return this.questionHelper.showComponentError(this.onAbort);
             }
-
-            if (!this.question.multi && typeof this.question.singleChoiceModel == 'undefined') {
-                // We couldn't find the option to select, select the first one.
-                this.question.singleChoiceModel = options[0].value;
-            }
         }
 
         return questionDiv;
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 055b0ba16..e08b10369 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -148,6 +148,7 @@ $spinner-ios-ios-color: $core-spinner-color;
 $tabs-ios-tab-color-inactive: $tabs-tab-color-inactive;
 $button-ios-outline-background-color: $core-button-outline-background-color;
 $toolbar-ios-height: 44px + 15;
+$checkbox-ios-icon-border-radius: 0px !default;
 
 // App Material Design Variables
 // --------------------------------------------------