diff --git a/js/questionset.js b/js/questionset.js
index b346c51..bab8a12 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -56,6 +56,10 @@ H5P.QuestionSet = function (options, contentId, contentData) {
           '  </div>' +
           '</div>';
 
+  var solutionButtonTemplate = options.endGame.showSolutionButton ?
+          '    <button type="button" class="h5p-joubelui-button h5p-button qs-solutionbutton"><%= solutionButtonText %></button>':
+          '';
+
   var resulttemplate =
           '<div class="questionset-results">' +
           '  <div class="greeting"><%= message %></div>' +
@@ -71,7 +75,7 @@ H5P.QuestionSet = function (options, contentId, contentData) {
           '  <% } %>' +
           '  <div class="buttons">' +
           '    <button type="button" class="h5p-joubelui-button h5p-button qs-finishbutton"><%= finishButtonText %></button>' +
-          '    <button type="button" class="h5p-joubelui-button h5p-button qs-solutionbutton"><%= solutionButtonText %></button>' +
+          solutionButtonTemplate +
           '    <button type="button" class="h5p-joubelui-button h5p-button qs-retrybutton"><%= retryButtonText %></button>' +
           '  </div>' +
           '</div>';
diff --git a/semantics.json b/semantics.json
index eaaa265..a3ebb19 100644
--- a/semantics.json
+++ b/semantics.json
@@ -212,6 +212,12 @@
         "label": "Display results",
         "default": true
       },
+      {
+        "name": "showSolutionButton",
+        "type": "boolean",
+        "label": "Display solution button",
+        "default": true
+      },
       {
         "name": "noResultMessage",
         "type": "text",