diff --git a/src/HeartTrackAPI/Program.cs b/src/HeartTrackAPI/Program.cs
index bc3f19e..5ab0c66 100644
--- a/src/HeartTrackAPI/Program.cs
+++ b/src/HeartTrackAPI/Program.cs
@@ -114,8 +114,13 @@ switch (Environment.GetEnvironmentVariable("TYPE"))
         break;
 }
 
+// app.Services.GetService<HeartTrackContext>()!.Database.EnsureCreated();
+
 builder.Services.AddSingleton<IDataManager>(provider =>
-    new DbDataManager(provider.GetRequiredService<HeartTrackContext>()));
+{
+    provider.GetRequiredService<HeartTrackContext>().Database.EnsureCreated();
+    return new DbDataManager(provider.GetRequiredService<HeartTrackContext>());
+});
 builder.Services.AddAuthorization();
 
 builder.Services.AddIdentityApiEndpoints<IdentityUser>()
@@ -165,6 +170,5 @@ if (true)
     });
 }
 
-app.Services.GetService<HeartTrackContext>()!.Database.EnsureCreated();
 
 app.Run();
\ No newline at end of file