diff --git a/pom.xml b/pom.xml
index 71d1f4bb..543141be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <description>Modules for queen back-office</description>
 
     <properties>
-        <revision>4.3.3</revision>
+        <revision>4.3.4</revision>
         <changelist></changelist>
         <java.version>21</java.version>
         <maven.compiler.source>21</maven.compiler.source>
diff --git a/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/CommentApiService.java b/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/CommentApiService.java
index a1f8b665..7c87e186 100644
--- a/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/CommentApiService.java
+++ b/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/CommentApiService.java
@@ -5,6 +5,7 @@
 import fr.insee.queen.domain.surveyunit.gateway.SurveyUnitRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @AllArgsConstructor
@@ -19,6 +20,7 @@ public ObjectNode getComment(String surveyUnitId) {
     }
 
     @Override
+    @Transactional
     public void updateComment(String surveyUnitId, ObjectNode commentValue) {
         surveyUnitRepository.saveComment(surveyUnitId, commentValue);
     }
diff --git a/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/DataApiService.java b/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/DataApiService.java
index 06740bbc..74e76cd4 100644
--- a/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/DataApiService.java
+++ b/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/DataApiService.java
@@ -6,6 +6,7 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Slf4j
@@ -21,11 +22,13 @@ public ObjectNode getData(String surveyUnitId) {
     }
 
     @Override
+    @Transactional
     public void saveData(String surveyUnitId, ObjectNode dataValue) {
         surveyUnitRepository.saveData(surveyUnitId, dataValue);
     }
 
     @Override
+    @Transactional
     public void updateCollectedData(String surveyUnitId, ObjectNode collectedData) {
         surveyUnitRepository.updateCollectedData(surveyUnitId, collectedData);
     }
diff --git a/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/StateDataApiService.java b/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/StateDataApiService.java
index 2f4a79a5..97fe8a5e 100644
--- a/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/StateDataApiService.java
+++ b/queen-domain/src/main/java/fr/insee/queen/domain/surveyunit/service/StateDataApiService.java
@@ -7,6 +7,7 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -27,6 +28,7 @@ public StateData getStateData(String surveyUnitId) {
     }
 
     @Override
+    @Transactional
     public void saveStateData(String surveyUnitId, StateData stateData) throws StateDataInvalidDateException {
         Optional<StateData> previousStateData = stateDataRepository.find(surveyUnitId);
         if (previousStateData.isEmpty()) {
diff --git a/queen-infra-db/src/main/resources/db/changelog/600_unique_constraints.xml b/queen-infra-db/src/main/resources/db/changelog/600_unique_constraints.xml
new file mode 100644
index 00000000..daec52a1
--- /dev/null
+++ b/queen-infra-db/src/main/resources/db/changelog/600_unique_constraints.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="davdarras" id="600-1">
+        <dropIndex indexName="idx_state_data_su"
+                   tableName="state_data"/>
+    </changeSet>
+
+    <changeSet author="davdarras" id="600-2">
+        <createIndex indexName="idx_state_data_su" tableName="state_data" unique="true">
+            <column name="survey_unit_id"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="davdarras" id="600-3">
+        <dropIndex indexName="idx_comment_su"
+                   tableName="comment"/>
+    </changeSet>
+
+    <changeSet author="davdarras" id="600-4">
+        <createIndex indexName="idx_comment_su" tableName="comment" unique="true">
+            <column name="survey_unit_id"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="davdarras" id="600-5">
+        <dropIndex indexName="idx_personalization_su"
+                   tableName="personalization"/>
+    </changeSet>
+
+    <changeSet author="davdarras" id="600-6">
+        <createIndex indexName="idx_personalization_su" tableName="personalization" unique="true">
+            <column name="survey_unit_id"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="davdarras" id="600-7">
+        <dropIndex indexName="idx_data_su"
+                   tableName="data"/>
+    </changeSet>
+
+    <changeSet author="davdarras" id="600-8">
+        <createIndex indexName="idx_data_su" tableName="data" unique="true">
+            <column name="survey_unit_id"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/queen-infra-db/src/main/resources/db/master.xml b/queen-infra-db/src/main/resources/db/master.xml
index f2d613a6..ccd0ae03 100644
--- a/queen-infra-db/src/main/resources/db/master.xml
+++ b/queen-infra-db/src/main/resources/db/master.xml
@@ -19,4 +19,5 @@
 	<!-- handle migrations of comments/datas/personalization sto surveyu_unit table -->
 	<include file="changelog/500_add_fields_to_paradataevent.xml" relativeToChangelogFile="true"/>
 	<include file="changelog/501_migrate_data_to_new_fields.sql" relativeToChangelogFile="true"/>
+	<include file="changelog/600_unique_constraints.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file