diff --git a/js/questionset.js b/js/questionset.js
index 1d73bf5..a1a2347 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -231,7 +231,7 @@ H5P.QuestionSet = function (options, contentId, contentData) {
 
   // Set overrides for questions
   var override;
-  if (params.override.showSolutionButton || params.override.retryButton || params.override.checkButton) {
+  if (params.override.showSolutionButton || params.override.retryButton || params.override.checkButton === false) {
     override = {};
     if (params.override.showSolutionButton) {
       // Force "Show solution" button to be on or off for all interactions
@@ -245,10 +245,9 @@ H5P.QuestionSet = function (options, contentId, contentData) {
           (params.override.retryButton === 'on' ? true : false);
     }
 
-    if (params.override.checkButton) {
-      // Force "Retry" button to be on or off for all interactions
-      override.enableCheckButton =
-          (params.override.checkButton === 'on' ? true : false);
+    if (params.override.checkButton === false) {
+      // Force "Check" button to be on or off for all interactions
+      override.enableCheckButton = params.override.checkButton;
     }
   }
 
diff --git a/semantics.json b/semantics.json
index 3d66070..49134cb 100644
--- a/semantics.json
+++ b/semantics.json
@@ -512,21 +512,12 @@
       },
       {
         "name": "checkButton",
-        "type": "select",
-        "label": "Override \"Check\" button",
+        "type": "boolean",
+        "label": "Show \"Check\" buttons",
         "importance": "low",
-        "description": "This option determines if the \"Check\" button will be shown for all questions, disabled for all or configured for each question individually.",
+        "description": "This option determines if the \"Check\" button will be shown for all questions.",
         "optional": true,
-        "options": [
-          {
-            "value": "on",
-            "label": "Enabled"
-          },
-          {
-            "value": "off",
-            "label": "Disabled"
-          }
-        ]
+        "default": true
       }
     ]
   }