1 files changed, 11 insertions, 17 deletions

diff --git a/packages/main/src/stores/config/loadConfig.ts b/packages/main/src/stores/config/loadConfig.ts
index 770d675..55d15c8 100644
--- a/packages/main/src/stores/config/loadConfig.ts
+++ b/packages/main/src/stores/config/loadConfig.ts
@@ -106,22 +106,13 @@ export default function loadConfig(
   target: {
     readonly profiles: IMSTArray<IReferenceType<typeof Profile>>;
     readonly profilesById: IMSTMap<typeof Profile>;
-    selectedService: Service | undefined;
     readonly services: IMSTArray<IReferenceType<typeof Service>>;
     readonly servicesById: IMSTMap<typeof Service>;
     readonly settings: GlobalSettings;
   },
   config: Config,
 ): void {
-  const {
-    profiles,
-    profilesById,
-    selectedService,
-    services,
-    servicesById,
-    settings,
-  } = target;
-  const { id: selectedServiceId } = selectedService ?? { id: undefined };
+  const { profiles, profilesById, services, servicesById, settings } = target;
   const {
     profiles: profilesConfig,
     services: servicesConfig,
@@ -134,13 +125,16 @@ export default function loadConfig(
   );
   applySettings(profiles, profilesById, profilesToApply);
   applySettings(services, servicesById, servicesToApply);
-  applySnapshot(settings, settingsToApply);
-  let newSelectedService: Service | undefined;
-  if (selectedServiceId !== undefined) {
-    newSelectedService = servicesById.get(selectedServiceId);
+  const { selectedService } = settingsToApply;
+  // Be more robust against when a deleted service is selected.
+  if (
+    typeof selectedService !== 'string' ||
+    !servicesById.has(selectedService)
+  ) {
+    settingsToApply.selectedService = undefined;
   }
-  if (newSelectedService === undefined && services.length > 0) {
-    [newSelectedService] = services;
+  applySnapshot(settings, settingsToApply);
+  if (settings.selectedService === undefined && services.length > 0) {
+    [settings.selectedService] = services;
   }
-  target.selectedService = newSelectedService;
 }