2 files changed, 2 insertions, 9 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 233751ddb..554bd704c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -128,10 +128,8 @@ namespace Tango.PPC.UI.PPCApplication
 
                         var settings = SettingsManager.Default.GetOrCreate<PPCSettings>(); ;
 
-                        using (ObservablesContext db = ObservablesContext.CreateDefault())
-                        {
-                            Machine = db.Machines.SingleOrDefault(x => x.SerialNumber == settings.MachineSerialNumber);
-                        }
+                        ObservablesEntitiesAdapter.Instance.Initialize();
+                        Machine = ObservablesEntitiesAdapter.Instance.Machines.FirstOrDefault();
                     });
 
                     ApplicationStarted?.Invoke(this, new EventArgs());
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
index f6b06ca61..5bc02f829 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
@@ -36,11 +36,6 @@ namespace Tango.PPC.UI.ViewModels
         /// </summary>
         public async override void OnApplicationStarted()
         {
-            await Task.Factory.StartNew(() =>
-            {
-                ObservablesEntitiesAdapter.Instance.Initialize();
-            });
-
             ApplicationManager.ModulesInitialized += (_, __) =>
             {
                 NavigationManager.NavigateTo(NavigationView.HomeModule);