diff --git a/src/Form/RiddlerSettingsForm.php b/src/Form/RiddlerSettingsForm.php
index 80ca048..87b1c2c 100755
--- a/src/Form/RiddlerSettingsForm.php
+++ b/src/Form/RiddlerSettingsForm.php
@@ -186,11 +186,16 @@ class RiddlerSettingsForm extends ConfigFormBase {
     }
     $values = $form_state->getValues()['riddler'];
     foreach ($values as $key => $value) {
-      if (empty($value['question'])) {
-        $form_state->setError($form['riddler'][$key]['question'], $this->t('Please add a question.'));
+      if (empty($value['question']) && empty($value['response'])) {
+        unset($form_state->getValues('riddler')['riddler'][$key]);
       }
-      if (empty($value['response'])) {
-        $form_state->setError($form['riddler'][$key]['response'], $this->t('Please add an answer.'));
+      else {
+        if (empty($value['question'])) {
+          $form_state->setError($form['riddler'][$key]['question'], $this->t('Please add a question.'));
+        }
+        if (empty($value['response'])) {
+          $form_state->setError($form['riddler'][$key]['response'], $this->t('Please add an answer.'));
+        }
       }
     }