diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java
index 8a98bac17..7410df918 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java
@@ -14,7 +14,6 @@ import java.util.List;
 @AllArgsConstructor
 public class NotificationPreferences {
 
-    private String userId;
     private boolean inAppNotificationsEnabled;
     private boolean emailNotificationsEnabled;
     private EmailNotificationType emailNotificationType;
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java
index bb2dfd1e8..92614de81 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java
@@ -19,11 +19,10 @@ public class NotificationPreferencesPersistenceService {
     @Transactional
     public void setNotificationPreference(String userId, NotificationPreferences notification) {
         notificationPreferencesRepository.findById(userId)
-                .ifPresentOrElse(n -> {
-                    BeanUtils.copyProperties(notification, n);
-                }, () -> {
+                .ifPresentOrElse(n -> BeanUtils.copyProperties(notification, n), () -> {
                     NotificationPreferencesEntity notificationPreferencesEntity = new NotificationPreferencesEntity();
                     BeanUtils.copyProperties(notification, notificationPreferencesEntity);
+                    notificationPreferencesEntity.setUserId(userId);
                     notificationPreferencesRepository.save(notificationPreferencesEntity);
                 });
     }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesTest.java
index 73b7b7314..234af86cf 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesTest.java
@@ -37,7 +37,7 @@ public class NotificationPreferencesTest extends AbstractPersistenceServerServic
         emailNotifications.add(DOSSIER_YOU_OWN_NOTIFICATION_1);
         emailNotifications.add(DOSSIER_YOU_OWN_NOTIFICATION_2);
         emailNotifications.add(DOSSIER_YOU_OWN_NOTIFICATION_4);
-        notificationPreferences = new NotificationPreferences(USER_ID, true, true, EmailNotificationType.DAILY, emailNotifications, inAppNotifications);
+        notificationPreferences = new NotificationPreferences(true, true, EmailNotificationType.DAILY, emailNotifications, inAppNotifications);
     }
 
     @Test