diff --git a/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap b/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap
index 7246a5e2a6..bf3fd943f0 100644
--- a/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap
+++ b/packages/vue-components/src/__tests__/__snapshots__/Questions.spec.js.snap
@@ -2039,14 +2039,7 @@ exports[`Text Questions of unanswered with shown hint, header without answer ren
       >
         <!---->
          
-        <button
-          class="btn btn-primary q-btn ml-1"
-          type="button"
-        >
-          
-          Check
-        
-        </button>
+        <!---->
          
         <!---->
          
diff --git a/packages/vue-components/src/questions/Question.vue b/packages/vue-components/src/questions/Question.vue
index 975a6aa446..490b035d1c 100644
--- a/packages/vue-components/src/questions/Question.vue
+++ b/packages/vue-components/src/questions/Question.vue
@@ -85,8 +85,9 @@
           >
             Hint
           </button>
+          <!-- Gracefully deprecate invalid question types without answers -->
           <button
-            v-if="qState.state === 0"
+            v-if="qState.state === 0 && !(!isValidTypeAndNotTextWithoutKeywords() && !$slots.answer)"
             key="check"
             type="button"
             class="btn btn-primary q-btn ml-1"