diff --git a/VRCFaceTracking.Core/Services/ModuleDataService.cs b/VRCFaceTracking.Core/Services/ModuleDataService.cs
index 3b35fc1a..d5fea7a7 100644
--- a/VRCFaceTracking.Core/Services/ModuleDataService.cs
+++ b/VRCFaceTracking.Core/Services/ModuleDataService.cs
@@ -27,6 +27,8 @@ private static IEnumerable<InstallableTrackingModule> AllModules()
         // and get the list of modules.
         var client = new HttpClient();
         var response = client.GetAsync("https://rjlk4u22t36tvqz3bvbkwv675a0wbous.lambda-url.us-east-1.on.aws/modules").Result;
+        if (!response.IsSuccessStatusCode)
+            return new List<InstallableTrackingModule>();
         var content = response.Content.ReadAsStringAsync().Result;
         return JsonConvert.DeserializeObject<List<InstallableTrackingModule>>(content);
     }
diff --git a/VRCFaceTracking/ViewModels/ModuleRegistryViewModel.cs b/VRCFaceTracking/ViewModels/ModuleRegistryViewModel.cs
index 15203322..4482d70a 100644
--- a/VRCFaceTracking/ViewModels/ModuleRegistryViewModel.cs
+++ b/VRCFaceTracking/ViewModels/ModuleRegistryViewModel.cs
@@ -71,7 +71,7 @@ public void OnNavigatedFrom()
 
     public void EnsureItemSelected()
     {
-        if (Selected == null)
+        if (Selected == null && ModuleInfos.Any())
         {
             Selected = ModuleInfos.First();
         }