diff --git a/lib/custom_wizard/builder.rb b/lib/custom_wizard/builder.rb
index daa73476..3e86c9c4 100644
--- a/lib/custom_wizard/builder.rb
+++ b/lib/custom_wizard/builder.rb
@@ -192,11 +192,16 @@ class CustomWizard::Builder
 
   def check_condition(template)
     if template['condition'].present?
-      CustomWizard::Mapper.new(
+      result = CustomWizard::Mapper.new(
         inputs: template['condition'],
         user: @wizard.user,
-        data: @wizard.current_submission
+        data: @wizard.current_submission,
+        opts: {
+          multiple: true
+        }
       ).perform
+
+      result.any?
     else
       true
     end
diff --git a/spec/components/custom_wizard/mapper_spec.rb b/spec/components/custom_wizard/mapper_spec.rb
index aa34f9f1..434f0001 100644
--- a/spec/components/custom_wizard/mapper_spec.rb
+++ b/spec/components/custom_wizard/mapper_spec.rb
@@ -130,21 +130,63 @@ describe CustomWizard::Mapper do
     end
   end
 
-  it "validates valid data" do
-    expect(CustomWizard::Mapper.new(
-      inputs: inputs['validation'],
-      data: data,
-      user: user1
-    ).perform).to eq(true)
-  end
+  context "conditional validation" do
+    it "validates valid data" do
+      expect(CustomWizard::Mapper.new(
+        inputs: inputs['validation'],
+        data: data,
+        user: user1
+      ).perform).to eq(true)
+    end
 
-  it "does not validate invalid data" do
-    data["input_2"] = "value 3"
-    expect(CustomWizard::Mapper.new(
-      inputs: inputs['validation'],
-      data: data,
-      user: user1
-    ).perform).to eq(false)
+    it "does not validate invalid data" do
+      data["input_2"] = "value 3"
+      expect(CustomWizard::Mapper.new(
+        inputs: inputs['validation'],
+        data: data,
+        user: user1
+      ).perform).to eq(false)
+    end
+
+    context "using or condition" do
+      it "validates the data when all of the conditions are met" do
+        expect(CustomWizard::Mapper.new(
+          inputs: inputs['validation_multiple_pairs'],
+          data: data,
+          user: user1,
+          opts: {
+            multiple: true
+          }
+        ).perform.any?).to eq(true)
+      end
+
+      it "validates the data when one of the conditions are met" do
+        custom_data = data.dup
+        custom_data['input_1'] = 'value 3'
+        expect(CustomWizard::Mapper.new(
+          inputs: inputs['validation_multiple_pairs'],
+          data: custom_data,
+          user: user1,
+          opts: {
+            multiple: true
+          }
+        ).perform.any?).to eq(true)
+      end
+
+      it "doesn't validate the data when none of the conditions are met" do
+        custom_data = data.dup
+        custom_data['input_1'] = 'value 3'
+        custom_data['input_2'] = 'value 4'
+        expect(CustomWizard::Mapper.new(
+          inputs: inputs['validation_multiple_pairs'],
+          data: custom_data,
+          user: user1,
+          opts: {
+            multiple: true
+          }
+        ).perform.any?).to eq(false)
+      end
+    end
   end
 
   it "maps text fields" do
diff --git a/spec/fixtures/mapper/inputs.json b/spec/fixtures/mapper/inputs.json
index 8faf2435..f7d98903 100644
--- a/spec/fixtures/mapper/inputs.json
+++ b/spec/fixtures/mapper/inputs.json
@@ -260,5 +260,34 @@
         }
       ]
     }
+  ],
+  "validation_multiple_pairs": [
+    {
+      "type": "validation",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "input_1",
+          "key_type": "wizard_field",
+          "value": "value 1",
+          "value_type": "text",
+          "connector": "equal"
+        }
+      ]
+    },
+    {
+      "type": "validation",
+      "connector": "or",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "input_2",
+          "key_type": "wizard_field",
+          "value": "value 2",
+          "value_type": "text",
+          "connector": "equal"
+        }
+      ]
+    }
   ]
 }
\ No newline at end of file