diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs
index 1ac661da0..2a3142bdd 100644
--- a/TeslaSolarCharger/Server/Program.cs
+++ b/TeslaSolarCharger/Server/Program.cs
@@ -118,13 +118,6 @@ async Task DoStartupStuff(WebApplication webApplication, ILogger<Program> logger
         var baseConfigurationService = webApplication.Services.GetRequiredService<IBaseConfigurationService>();
         var teslaMateContextWrapper = webApplication.Services.GetRequiredService<ITeslaMateDbContextWrapper>();
         var teslaMateContext = teslaMateContextWrapper.GetTeslaMateContextIfAvailable();
-        //This needs to be done before first base configuration update otherwise all TeslaMate values are removed
-        if (teslaMateContext != default)
-        {
-            baseConfiguration.UseTeslaMateIntegration = true;
-            baseConfiguration.UseTeslaMateAsDataSource = true;
-        }
-        await baseConfigurationService.UpdateBaseConfigurationAsync(baseConfiguration);
         if (teslaMateContext != default)
         {
             try