diff --git a/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java b/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java
index feb0baf..ddcc279 100644
--- a/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java
+++ b/src/main/java/it/gov/pagopa/onboarding/citizen/service/CitizenServiceImpl.java
@@ -40,7 +40,7 @@ public Mono<CitizenConsentDTO> createCitizenConsent(CitizenConsentDTO citizenCon
         citizenConsent.setCreationDate(LocalDateTime.now());
         citizenConsent.setLastUpdateDate(LocalDateTime.now());
         log.info("[EMD-CITIZEN][CREATE] Received consent: {}",inputSanify(citizenConsent.toString()));
-        return citizenRepository.findById(hashedFiscalCode)
+        return citizenRepository.findByHashedFiscalCodeAndTppId(hashedFiscalCode,citizenConsent.getTppId())
                 .flatMap(existingConsent -> {
                     log.info("[EMD][CREATE-CITIZEN-CONSENT] Citizen consent already exists");
                     return Mono.just(mapperToDTO.map(existingConsent));
@@ -48,7 +48,7 @@ public Mono<CitizenConsentDTO> createCitizenConsent(CitizenConsentDTO citizenCon
                 .switchIfEmpty(
                         citizenRepository.save(citizenConsent)
                                 .doOnSuccess(savedConsent -> log.info("[EMD][CREATE-CITIZEN-CONSENT] Created new citizen consent"))
-                                .flatMap(savedConsent -> Mono.just(mapperToDTO.map(savedConsent))) // Map the saved consent
+                                .flatMap(savedConsent -> Mono.just(mapperToDTO.map(savedConsent)))
                 );
     }