diff --git a/src/components/MessageWarningValidation.vue b/src/components/MessageWarningValidation.vue
index f5f442ec9105..30bb4e9b0920 100644
--- a/src/components/MessageWarningValidation.vue
+++ b/src/components/MessageWarningValidation.vue
@@ -37,8 +37,8 @@ const tPath = computed(() => {
       <template v-if="validationName === 'passport-gated'">
         {{
           $t(`${tPath}.passport-gated.invalidMessage`, {
-            operator: validationParams?.operator === 'AND' ? 'all' : 'one',
-            stamps: validationParams?.stamps.join(', '),
+            operator: validationParams?.operator === 'AND' ? 'all' : 'any',
+            stamps: validationParams?.stamps.length === 0 ? 'any valid Stamp' : validationParams?.stamps.join(', '),
             scoreThreshold: validationParams?.scoreThreshold || 0
           })
         }}
diff --git a/src/components/ModalValidation.vue b/src/components/ModalValidation.vue
index 6425d29fb824..4692fd3ec9ea 100644
--- a/src/components/ModalValidation.vue
+++ b/src/components/ModalValidation.vue
@@ -75,8 +75,11 @@ 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 = '';
+    if (input.value.params.stamps?.[0] === undefined)
+      input.value.params.stamps = [];
   }
 }
 
diff --git a/src/components/ModalVoteValidation.vue b/src/components/ModalVoteValidation.vue
index 649784535dc2..3a2a20d7fe2a 100644
--- a/src/components/ModalVoteValidation.vue
+++ b/src/components/ModalVoteValidation.vue
@@ -73,8 +73,11 @@ 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 = '';
+    if (input.value.params.stamps?.[0] === undefined)
+      input.value.params.stamps = [];
   }
 }
 
diff --git a/src/locales/default.json b/src/locales/default.json
index 24374076b690..be1b0f550bd8 100644
--- a/src/locales/default.json
+++ b/src/locales/default.json
@@ -741,7 +741,7 @@
     "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} and {operator} of the following stamps to create a proposal: {stamps}. "
     },
     "arbitrum": {
       "label": "Arbitrum DAO votable supply",