diff --git a/backend/src/main/java/com/petshop/backend/config/FlywayContextInitializer.java b/backend/src/main/java/com/petshop/backend/config/FlywayContextInitializer.java
index d7846581..15c9b976 100644
--- a/backend/src/main/java/com/petshop/backend/config/FlywayContextInitializer.java
+++ b/backend/src/main/java/com/petshop/backend/config/FlywayContextInitializer.java
@@ -37,7 +37,8 @@ public class FlywayContextInitializer implements ApplicationContextInitializer<C
                 Flyway flyway = Flyway.configure()
                         .dataSource(url, username, password)
                         .locations(locations)
-                        .validateOnMigrate(false)
+                        .baselineOnMigrate(true)
+                        .baselineVersion("0")
                         .load();
                 flyway.repair();
                 flyway.migrate();
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 89ad051f..20773f86 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -40,8 +40,6 @@ spring:
 
   flyway:
     enabled: ${FLYWAY_ENABLED:false}
-    baseline-on-migrate: true
-    baseline-version: 0
 
 server:
   port: ${SERVER_PORT:8080}