diff --git a/packages/form-builder/addon/components/cfb-form-editor/question-option.hbs b/packages/form-builder/addon/components/cfb-form-editor/question-option.hbs
new file mode 100644
index 000000000..c75299719
--- /dev/null
+++ b/packages/form-builder/addon/components/cfb-form-editor/question-option.hbs
@@ -0,0 +1,87 @@
+<li class="cfb-option-row" data-test-row={{concat "option-" (add @i 1)}}>
+  <ValidatedForm @model={{@row}} as |f|>
+    <div uk-grid class="uk-grid-small uk-flex uk-flex-top" id={{@row.slug}}>
+      <div class="uk-width-auto uk-flex uk-flex-middle">
+        {{#if @canReorder}}
+          <span
+            data-test-sort-handle
+            uk-icon="menu"
+            class="uk-sortable-handle uk-margin-small-right"
+            role="button"
+          ></span>
+        {{/if}}
+        {{#if (is-empty @row.id)}}
+          <button
+            data-test-delete-row
+            type="button"
+            class="uk-icon-button"
+            uk-icon="trash"
+            title={{t "caluma.form-builder.options.delete"}}
+            {{on "click" @deleteRow}}
+          >
+          </button>
+        {{else}}
+          <button
+            data-test-archive-row
+            type="button"
+            class="uk-icon-button"
+            uk-icon={{if @row.isArchived "refresh" "close"}}
+            title={{t
+              (concat
+                "caluma.form-builder.options."
+                (if @row.isArchived "restore" "archive")
+              )
+            }}
+            {{on
+              "click"
+              (fn (changeset-set @row "isArchived") (not @row.isArchived))
+            }}
+          >
+          </button>
+        {{/if}}
+      </div>
+      <div class="uk-width-expand">
+        <f.input
+          @name="label"
+          @inputName={{concat "option-" (add @i 1) "-label"}}
+          @required={{true}}
+          @disabled={{@row.isArchived}}
+          @on-update={{@updateLabel}}
+        />
+      </div>
+      <div class="uk-width-1-4">
+        <f.input
+          @name="slug"
+          @inputName={{concat "option-" (add @i 1) "-slug"}}
+          @required={{true}}
+          @disabled={{not (is-empty @row.id)}}
+          @renderComponent={{component
+            "cfb-slug-input"
+            hidePrefix=true
+            prefix=@model.slug
+            onUnlink=(fn (mut @row.slugUnlinked) true)
+          }}
+        />
+      </div>
+      <div class="uk-width-auto">
+        <button
+          data-test-toggle-jexl
+          type="button"
+          class="uk-icon-button"
+          uk-icon={{if this.showJexl "triangle-up" "triangle-down"}}
+          title={{t "caluma.form-builder.options.show-jexl"}}
+          {{on "click" (fn (mut this.showJexl) (not this.showJexl))}}
+        />
+      </div>
+      {{#if this.showJexl}}
+        <div class="uk-width-4-4">
+          <f.input
+            @label={{t "caluma.form-builder.question.isHidden"}}
+            @name="isHidden"
+            @renderComponent={{component "cfb-code-editor" language="jexl"}}
+          />
+        </div>
+      {{/if}}
+    </div>
+  </ValidatedForm>
+</li>
\ No newline at end of file
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question-option.js b/packages/form-builder/addon/components/cfb-form-editor/question-option.js
new file mode 100644
index 000000000..6b4f30ae4
--- /dev/null
+++ b/packages/form-builder/addon/components/cfb-form-editor/question-option.js
@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+export default class CfbFormEditorQuestionOption extends Component {
+  @tracked showJexl = false;
+}
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question.js b/packages/form-builder/addon/components/cfb-form-editor/question.js
index 2c1d3f0d2..c98d6bc52 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question.js
+++ b/packages/form-builder/addon/components/cfb-form-editor/question.js
@@ -363,11 +363,11 @@ export default class CfbFormEditorQuestion extends Component {
       (changeset.get("options") || [])
         .filter((option) => option.get("isDirty"))
         .map(async (option) => {
-          const { label, slug, isArchived } = option;
+          const { label, slug, isArchived, isHidden } = option;
 
           await this.apollo.mutate({
             mutation: saveOptionMutation,
-            variables: { input: { label, slug, isArchived } },
+            variables: { input: { label, slug, isArchived, isHidden } },
           });
         }),
     );
@@ -471,6 +471,7 @@ export default class CfbFormEditorQuestion extends Component {
             label: "",
             slug: "",
             isArchived: false,
+            isHidden: "false",
             slugUnlinked: false,
             question: this.model.slug,
           },
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs b/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs
index 2e41fb60e..b6e73d588 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs
+++ b/packages/form-builder/addon/components/cfb-form-editor/question/default.hbs
@@ -1,6 +1,8 @@
 <div class="uk-margin">
   <@labelComponent />
 
+  {{! Default values for ChoiceQuestions and MultipleChoiceQuestion options are not updated
+  when a new one is added because the object returned by `this.field` is too nested to track properly. }}
   <div class="uk-form-controls">
     {{component
       (get-widget this.field.question)
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question/default.js b/packages/form-builder/addon/components/cfb-form-editor/question/default.js
index ee2cb0bca..6b2f9d361 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question/default.js
+++ b/packages/form-builder/addon/components/cfb-form-editor/question/default.js
@@ -45,7 +45,16 @@ export default class CfbFormEditorQuestionDefault extends Component {
       // Format option changesets to match the raw format needed in lib.
       raw[key] = {
         edges: raw.options.map((node) => {
-          return { node };
+          return {
+            node: {
+              ...node.get("data"),
+              ...node.get("change"),
+              // While we want the real value of the option, the option should never
+              // be hidden in the form-builder. We need to set a value here as no
+              // value will lead to a Jexl error.
+              isHidden: "false",
+            },
+          };
         }),
       };
       delete raw.options;
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question/options.hbs b/packages/form-builder/addon/components/cfb-form-editor/question/options.hbs
index 4b540ab6b..eeaca4e65 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question/options.hbs
+++ b/packages/form-builder/addon/components/cfb-form-editor/question/options.hbs
@@ -8,80 +8,14 @@
     class="uk-list uk-list-divider uk-form-controls uk-margin-small-top"
   >
     {{#each @value as |row i|}}
-      <li class="cfb-option-row" data-test-row={{concat "option-" (add i 1)}}>
-        <ValidatedForm @model={{row}} as |f|>
-          <div
-            uk-grid
-            class="uk-grid-small uk-flex uk-flex-top"
-            id={{row.slug}}
-          >
-            <div class="uk-width-auto uk-flex uk-flex-middle">
-              {{#if this.canReorder}}
-                <span
-                  data-test-sort-handle
-                  uk-icon="menu"
-                  class="uk-sortable-handle uk-margin-small-right"
-                  role="button"
-                ></span>
-              {{/if}}
-              {{#if (is-empty row.id)}}
-                <button
-                  data-test-delete-row
-                  type="button"
-                  class="uk-icon-button"
-                  uk-icon="trash"
-                  title={{t "caluma.form-builder.options.delete"}}
-                  {{on "click" (fn this.deleteRow row)}}
-                >
-                </button>
-              {{else}}
-                <button
-                  data-test-archive-row
-                  type="button"
-                  class="uk-icon-button"
-                  uk-icon={{if row.isArchived "refresh" "close"}}
-                  title={{t
-                    (concat
-                      "caluma.form-builder.options."
-                      (if row.isArchived "restore" "archive")
-                    )
-                  }}
-                  {{on
-                    "click"
-                    (fn (changeset-set row "isArchived") (not row.isArchived))
-                  }}
-                >
-                </button>
-              {{/if}}
-            </div>
-            <div class="uk-width-expand">
-              <f.input
-                @name="label"
-                @inputName={{concat "option-" (add i 1) "-label"}}
-                @required={{true}}
-                @disabled={{row.isArchived}}
-                @submitted={{@submitted}}
-                @on-update={{this.updateLabel}}
-              />
-            </div>
-            <div class="uk-width-1-4">
-              <f.input
-                @name="slug"
-                @inputName={{concat "option-" (add i 1) "-slug"}}
-                @required={{true}}
-                @disabled={{not (is-empty row.id)}}
-                @submitted={{@submitted}}
-                @renderComponent={{component
-                  "cfb-slug-input"
-                  hidePrefix=true
-                  prefix=@model.slug
-                  onUnlink=(fn (mut row.slugUnlinked) true)
-                }}
-              />
-            </div>
-          </div>
-        </ValidatedForm>
-      </li>
+      <CfbFormEditor::QuestionOption
+        @i={{i}}
+        @row={{row}}
+        @model={{@model}}
+        @canReorder={{this.canReorder}}
+        @deleteRow={{fn this.deleteRow row}}
+        @updateLabel={{this.updateLabel}}
+      />
     {{/each}}
     <li class="uk-text-center">
       <button
diff --git a/packages/form-builder/addon/components/cfb-form-editor/question/options.js b/packages/form-builder/addon/components/cfb-form-editor/question/options.js
index 8ee0a45df..a625f3327 100644
--- a/packages/form-builder/addon/components/cfb-form-editor/question/options.js
+++ b/packages/form-builder/addon/components/cfb-form-editor/question/options.js
@@ -64,6 +64,7 @@ export default class CfbFormEditorQuestionOptions extends Component {
           slug: "",
           label: "",
           isArchived: false,
+          isHidden: "false",
           slugUnlinked: false,
           question: this.args.model.slug,
         },
diff --git a/packages/form-builder/addon/gql/mutations/save-option.graphql b/packages/form-builder/addon/gql/mutations/save-option.graphql
index 7d3960d28..cd4a5ee3f 100644
--- a/packages/form-builder/addon/gql/mutations/save-option.graphql
+++ b/packages/form-builder/addon/gql/mutations/save-option.graphql
@@ -4,6 +4,7 @@ mutation SaveOption($input: SaveOptionInput!) {
       id
       label
       slug
+      isHidden
     }
   }
 }
diff --git a/packages/form-builder/addon/gql/queries/form-editor-question.graphql b/packages/form-builder/addon/gql/queries/form-editor-question.graphql
index 1c1ecaa93..bdadbb6a2 100644
--- a/packages/form-builder/addon/gql/queries/form-editor-question.graphql
+++ b/packages/form-builder/addon/gql/queries/form-editor-question.graphql
@@ -76,6 +76,7 @@ query FormEditorQuestion($slug: String!) {
                 label
                 slug
                 isArchived
+                isHidden
               }
             }
           }
@@ -93,6 +94,7 @@ query FormEditorQuestion($slug: String!) {
                 label
                 slug
                 isArchived
+                isHidden
               }
             }
           }
diff --git a/packages/form-builder/translations/de.yaml b/packages/form-builder/translations/de.yaml
index 144b330b2..fb58babb0 100644
--- a/packages/form-builder/translations/de.yaml
+++ b/packages/form-builder/translations/de.yaml
@@ -144,6 +144,7 @@ caluma:
       delete: "Option löschen"
       archive: "Option archivieren (verstecken)"
       restore: "Option wiederherstellen"
+      show-jexl: "JEXL anzeigen"
 
     notification:
       form:
diff --git a/packages/form-builder/translations/en.yaml b/packages/form-builder/translations/en.yaml
index 9e97d7ad0..667e31e9d 100644
--- a/packages/form-builder/translations/en.yaml
+++ b/packages/form-builder/translations/en.yaml
@@ -144,6 +144,7 @@ caluma:
       delete: "Delete option"
       archive: "Archive (hide) option"
       restore: "Restore option"
+      show-jexl: "Show JEXL"
 
     notification:
       form:
diff --git a/packages/form-builder/translations/fr.yaml b/packages/form-builder/translations/fr.yaml
index e4bb1386b..b33c2c857 100644
--- a/packages/form-builder/translations/fr.yaml
+++ b/packages/form-builder/translations/fr.yaml
@@ -144,6 +144,7 @@ caluma:
       delete: "Supprimer l'option"
       archive: "Archiver (masquer) l'option"
       restore: "Restaurer l'option"
+      show-jexl: "Afficher JEXL"
 
     notification:
       form:
diff --git a/packages/form-builder/translations/it.yaml b/packages/form-builder/translations/it.yaml
index 7524aceed..1f8b4148f 100644
--- a/packages/form-builder/translations/it.yaml
+++ b/packages/form-builder/translations/it.yaml
@@ -144,6 +144,7 @@ caluma:
       delete: "Elimina opzione"
       archive: "Archivia (nascondi) opzione"
       restore: "Ripristina opzione"
+      show-jexl: "Mostra JEXL"
 
     notification:
       form:
diff --git a/packages/form/addon/gql/fragments/field.graphql b/packages/form/addon/gql/fragments/field.graphql
index b648652f0..ff08b7865 100644
--- a/packages/form/addon/gql/fragments/field.graphql
+++ b/packages/form/addon/gql/fragments/field.graphql
@@ -72,6 +72,7 @@ fragment SimpleQuestion on Question {
           slug
           label
           isArchived
+          isHidden
         }
       }
     }
@@ -89,6 +90,7 @@ fragment SimpleQuestion on Question {
           slug
           label
           isArchived
+          isHidden
         }
       }
     }
diff --git a/packages/form/addon/lib/field.js b/packages/form/addon/lib/field.js
index 652e9467a..eefa42137 100644
--- a/packages/form/addon/lib/field.js
+++ b/packages/form/addon/lib/field.js
@@ -339,7 +339,10 @@ export default class Field extends Base {
    * - DynamicMultipleChoiceQuestion
    *
    * This will also return the disabled state of the option. An option can only
-   * be disabled, if it is an old value used in a dynamic question.
+   * be disabled in any of the following cases:
+   * - it is a dynamic option which is no longer available
+   * - the option has been removed from the form using the form builder
+   * - the option is no longer visible due to its JEXL
    *
    * @property {null|Object[]} options
    */
@@ -352,9 +355,39 @@ export default class Field extends Base {
     const selected =
       (this.question.isMultipleChoice ? this.value : [this.value]) || [];
 
-    const options = this.question.options.filter(
-      (option) => !option.disabled || selected.includes(option.slug),
-    );
+    const options = this.question.options
+      .filter((option) => !option.disabled || selected.includes(option.slug))
+      .map((option) => {
+        if (!option.isHidden) {
+          return option;
+        }
+
+        try {
+          const isHidden = this.document.jexl.evalSync(
+            option.isHidden,
+            this.jexlContext,
+          );
+
+          if (selected.includes(option.slug) && isHidden) {
+            return {
+              ...option,
+              _isHidden: isHidden,
+              disabled: true,
+            };
+          }
+          return {
+            ...option,
+            _isHidden: isHidden,
+          };
+        } catch (error) {
+          throw new Error(
+            `Error while evaluating \`isHidden\` expression on Option\`${option.slug}\`: ${error.message}`,
+          );
+        }
+      })
+      .filter(
+        ({ _isHidden, disabled }) => !_isHidden || (_isHidden && disabled),
+      );
 
     const hasUnknownValue = !selected.every((slug) =>
       options.find((option) => option.slug === slug),
diff --git a/packages/form/addon/lib/question.js b/packages/form/addon/lib/question.js
index 3e2e5479f..abf89a605 100644
--- a/packages/form/addon/lib/question.js
+++ b/packages/form/addon/lib/question.js
@@ -141,11 +141,14 @@ export default class Question extends Base {
     const key = camelize(this.raw.__typename.replace(/Question$/, "Options"));
     const raw = this.isDynamic ? this[key] : this.raw[key];
 
-    return (raw?.edges || []).map(({ node: { label, slug, isArchived } }) => ({
-      label,
-      slug,
-      disabled: isArchived || false,
-    }));
+    return (raw?.edges || []).map(
+      ({ node: { label, slug, isArchived, isHidden } }) => ({
+        label,
+        slug,
+        disabled: isArchived || false,
+        isHidden,
+      }),
+    );
   }
 
   /**
diff --git a/packages/form/tests/unit/lib/field-test.js b/packages/form/tests/unit/lib/field-test.js
index e9c85a1fb..d295adea3 100644
--- a/packages/form/tests/unit/lib/field-test.js
+++ b/packages/form/tests/unit/lib/field-test.js
@@ -391,7 +391,7 @@ module("Unit | Library | field", function (hooks) {
   });
 
   test("it can validate radio fields", async function (assert) {
-    assert.expect(1);
+    assert.expect(2);
 
     const field = this.addField({
       question: {
@@ -401,6 +401,7 @@ module("Unit | Library | field", function (hooks) {
               node: {
                 slug: "option-1",
                 label: "Option 1",
+                isHidden: "false",
               },
             },
             {
@@ -408,6 +409,14 @@ module("Unit | Library | field", function (hooks) {
                 slug: "invalid-option",
                 label: "Invalid Option",
                 isArchived: true,
+                isHidden: "false",
+              },
+            },
+            {
+              node: {
+                slug: "hidden-option",
+                label: "Hidden Option",
+                isHidden: "true",
               },
             },
           ],
@@ -428,10 +437,16 @@ module("Unit | Library | field", function (hooks) {
     assert.deepEqual(field.errors, [
       '"Invalid Option" is not a valid value for this field',
     ]);
+
+    field.answer.value = "hidden-option";
+    await field.validate.perform();
+    assert.deepEqual(field.errors, [
+      '"Hidden Option" is not a valid value for this field',
+    ]);
   });
 
   test("it can validate checkbox fields", async function (assert) {
-    assert.expect(2);
+    assert.expect(3);
 
     const field = this.addField({
       question: {
@@ -450,6 +465,13 @@ module("Unit | Library | field", function (hooks) {
                 isArchived: true,
               },
             },
+            {
+              node: {
+                slug: "hidden-option",
+                label: "Hidden Option",
+                isHidden: "true",
+              },
+            },
           ],
         },
         isHidden: "false",
@@ -475,6 +497,12 @@ module("Unit | Library | field", function (hooks) {
       '"Invalid Option" is not a valid value for this field',
       '"other-invalid-option" is not a valid value for this field',
     ]);
+
+    field.answer.value = ["hidden-option"];
+    await field.validate.perform();
+    assert.deepEqual(field.errors, [
+      '"Hidden Option" is not a valid value for this field',
+    ]);
   });
 
   test("it can validate table fields", async function (assert) {
diff --git a/packages/testing/addon-mirage-support/factories/option.js b/packages/testing/addon-mirage-support/factories/option.js
index c2cff09d6..8699333d2 100644
--- a/packages/testing/addon-mirage-support/factories/option.js
+++ b/packages/testing/addon-mirage-support/factories/option.js
@@ -8,4 +8,5 @@ export default Factory.extend({
   label: (i) => `Option ${i + 1}`,
   meta: () => ({}),
   isArchived: false,
+  isHidden: "false",
 });
diff --git a/packages/testing/addon/mirage-graphql/schema.graphql b/packages/testing/addon/mirage-graphql/schema.graphql
index 8deee3a00..dc89a921d 100644
--- a/packages/testing/addon/mirage-graphql/schema.graphql
+++ b/packages/testing/addon/mirage-graphql/schema.graphql
@@ -3237,6 +3237,7 @@ input SaveOptionInput {
   slug: String!
   label: String!
   isArchived: Boolean
+  isHidden: QuestionJexl
   meta: JSONString
   clientMutationId: String
 }