diff --git a/src/Ombi.Store/Repository/SettingsJsonRepository.cs b/src/Ombi.Store/Repository/SettingsJsonRepository.cs
index 09bf61695..248413ccc 100644
--- a/src/Ombi.Store/Repository/SettingsJsonRepository.cs
+++ b/src/Ombi.Store/Repository/SettingsJsonRepository.cs
@@ -81,6 +81,7 @@ namespace Ombi.Store.Repository
 
         public void Update(GlobalSettings entity)
         {
+            Db.Update(entity);
             //_cache.Remove(GetName(entity.SettingsName));
             Db.SaveChanges();
         }
diff --git a/src/Ombi/Program.cs b/src/Ombi/Program.cs
index 9294852f9..7e9fa6f78 100644
--- a/src/Ombi/Program.cs
+++ b/src/Ombi/Program.cs
@@ -82,7 +82,7 @@ namespace Ombi
                         ctx.SaveChanges();
                     }
                 }
-                else if(!baseUrl.Equals(dbBaseUrl.Value))
+                else if(baseUrl.HasValue() && !baseUrl.Equals(dbBaseUrl.Value))
                 {
                     dbBaseUrl.Value = baseUrl;
                     ctx.SaveChanges();
diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs
index 7fc0522ed..55a49fa92 100644
--- a/src/Ombi/Startup.cs
+++ b/src/Ombi/Startup.cs
@@ -173,26 +173,22 @@ namespace Ombi
                 settings.ApiKey = Guid.NewGuid().ToString("N");
                 ombiService.SaveSettings(settings);
             }
+
+            // Check if it's in the startup args
+            var appConfig = serviceProvider.GetService<IApplicationConfigRepository>();
+            var baseUrl = appConfig.Get(ConfigurationTypes.BaseUrl).Result;
+            if (baseUrl != null)
+            {
+                if (baseUrl.Value.HasValue())
+                {
+                    settings.BaseUrl = baseUrl.Value;
+                    ombiService.SaveSettings(settings);
+                }
+            }
             if (settings.BaseUrl.HasValue())
             {
                 app.UsePathBase(settings.BaseUrl);
             }
-            else
-            {
-                // Check if it's in the startup args
-                var appConfig = serviceProvider.GetService<IApplicationConfigRepository>();
-                var baseUrl = appConfig.Get(ConfigurationTypes.BaseUrl).Result;
-                if (baseUrl != null)
-                {
-                    if (baseUrl.Value.HasValue())
-                    {
-                        settings.BaseUrl = baseUrl.Value;
-                        ombiService.SaveSettings(settings);
-
-                        app.UsePathBase(settings.BaseUrl);
-                    }
-                }
-            }
 
             app.UseHangfireServer(new BackgroundJobServerOptions { WorkerCount = 1, ServerTimeout = TimeSpan.FromDays(1), ShutdownTimeout = TimeSpan.FromDays(1)});
             app.UseHangfireDashboard(settings.BaseUrl.HasValue() ? $"{settings.BaseUrl}/hangfire" : "/hangfire",