diff --git a/src/components/MessageWarningValidation.vue b/src/components/MessageWarningValidation.vue
index f5f442ec9105..5d1d9f2ac865 100644
--- a/src/components/MessageWarningValidation.vue
+++ b/src/components/MessageWarningValidation.vue
@@ -33,13 +33,20 @@ const tPath = computed(() => {
       </BaseLink>
     </template>
 
-    <template v-else-if="validationName === 'passport-gated'">
-      <template v-if="validationName === 'passport-gated'">
+    <template v-if="validationName === 'passport-gated'">
+      {{
+        $t(`${tPath}.passport-gated.invalidMessage`, {
+          scoreThreshold: validationParams?.scoreThreshold || 0
+        })
+      }}<span v-if="props.validationParams?.operator === 'NONE'">. </span>
+
+      <template v-else>
         {{
-          $t(`${tPath}.passport-gated.invalidMessage`, {
-            operator: validationParams?.operator === 'AND' ? 'all' : 'one',
-            stamps: validationParams?.stamps.join(', '),
-            scoreThreshold: validationParams?.scoreThreshold || 0
+          $t(`${tPath}.passport-gated.invalidMessageStamps`, {
+            operator:
+              props.validationParams?.operator === 'AND' ? 'all' : 'one',
+            stamps:
+              validationParams.stamps && validationParams.stamps.join(', ')
           })
         }}
       </template>
diff --git a/src/components/ModalValidation.vue b/src/components/ModalValidation.vue
index 6425d29fb824..66b21ab57fa1 100644
--- a/src/components/ModalValidation.vue
+++ b/src/components/ModalValidation.vue
@@ -41,12 +41,23 @@ type Validations = Record<
 >;
 
 const validationDefinition = computed(() => {
-  return (
+  const definition =
     validations.value?.[input.value.name]?.schema?.definitions?.Validation ||
-    null
-  );
+    null;
+
+  if (input.value.name === 'passport-gated')
+    return definePassportGated(clone(definition));
+
+  return definition;
 });
 
+function definePassportGated(definition: any) {
+  if (input.value.params.operator === 'NONE')
+    delete definition.properties.stamps;
+
+  return definition;
+}
+
 const validationErrors = computed(() => {
   return validateForm(validationDefinition.value || {}, input.value.params);
 });
@@ -75,12 +86,14 @@ function handleSelect(n: string) {
     }
   }
 
-  if (n === 'passport-gated' && !input.value.params.operator) {
-    input.value.params.operator = 'OR';
+  if (n === 'passport-gated') {
+    if (!input.value.params.operator) input.value.params.operator = 'NONE';
   }
 }
 
 function handleSubmit() {
+  if (input.value.name === 'passport-gated') handlePassportGated();
+
   if (!isValid.value || !isValidParams.value) {
     strategiesFormRef.value?.forceShowError();
     formRef?.value?.forceShowError();
@@ -91,6 +104,16 @@ function handleSubmit() {
   emit('close');
 }
 
+function handlePassportGated() {
+  if (!input.value.params.stamps?.[0]) {
+    input.value.params.stamps = undefined;
+    input.value.params.operator = 'NONE';
+  }
+  if (input.value.params.operator === 'NONE') {
+    input.value.params.stamps = undefined;
+  }
+}
+
 function removeVoteValidationOnly(validations: Validations) {
   Object.keys(validations).forEach(key => {
     if (validations[key]?.voteValidationOnly) {
diff --git a/src/components/ModalVoteValidation.vue b/src/components/ModalVoteValidation.vue
index 649784535dc2..ef84f6757bfe 100644
--- a/src/components/ModalVoteValidation.vue
+++ b/src/components/ModalVoteValidation.vue
@@ -42,12 +42,23 @@ const isValidationsLoaded = ref(false);
 const updateIndex = ref(0);
 
 const validationDefinition = computed(() => {
-  return (
+  const definition =
     validations.value?.[input.value.name]?.schema?.definitions?.Validation ||
-    null
-  );
+    null;
+
+  if (input.value.name === 'passport-gated')
+    return definePassportGated(clone(definition));
+
+  return definition;
 });
 
+function definePassportGated(definition: any) {
+  if (input.value.params.operator === 'NONE')
+    delete definition.properties.stamps;
+
+  return definition;
+}
+
 const validationErrors = computed(() => {
   return validateForm(validationDefinition.value || {}, input.value.params);
 });
@@ -73,12 +84,14 @@ function select(n: string) {
     }
   }
 
-  if (n === 'passport-gated' && !input.value.params.operator) {
-    input.value.params.operator = 'OR';
+  if (n === 'passport-gated') {
+    if (!input.value.params.operator) input.value.params.operator = 'NONE';
   }
 }
 
 function handleSubmit() {
+  if (input.value.name === 'passport-gated') handlePassportGatedNoneOperator();
+
   if (!isValid.value || !isValidParams.value) {
     strategiesFormRef.value?.forceShowError();
     formRef?.value?.forceShowError();
@@ -89,6 +102,16 @@ function handleSubmit() {
   emit('close');
 }
 
+function handlePassportGatedNoneOperator() {
+  if (!input.value.params.stamps?.[0]) {
+    input.value.params.stamps = undefined;
+    input.value.params.operator = 'NONE';
+  }
+  if (input.value.params.operator === 'NONE') {
+    input.value.params.stamps = undefined;
+  }
+}
+
 function removeProposalValidationOnly(validations: Validations) {
   Object.keys(validations).forEach(key => {
     if (validations[key]?.proposalValidationOnly) {
diff --git a/src/locales/default.json b/src/locales/default.json
index fca6c6f846a0..d82eaa3422b0 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -749,7 +749,8 @@
     "passport-gated": {
       "label": "Gitcoin Passport gated",
       "description": "Protect your space from spam by requiring users to have a Gitcoin Passport to create a proposal.",
-      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold} and {operator} of the following stamps to vote on this proposal: {stamps}. "
+      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold}",
+      "invalidMessageStamps": " and {operator} of the following stamps to create a proposal: {stamps} "
     },
     "arbitrum": {
       "label": "Arbitrum DAO votable supply",
@@ -782,7 +783,8 @@
     "passport-gated": {
       "label": "Gitcoin Passport gated",
       "description": "Protect your proposals from spam and vote manipulation by requiring users to have a Gitcoin Passport.",
-      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold} and {operator} of the following stamps to vote on this proposal: {stamps}. "
+      "invalidMessage": "You need a Gitcoin Passport with score above {scoreThreshold}",
+      "invalidMessageStamps": " and {operator} of the following stamps to vote on this proposal: {stamps} "
     }
   },
   "safeSnap": {