diff --git a/lib/modules/browse/extension/extension_detail.dart b/lib/modules/browse/extension/extension_detail.dart
index a4ce7792..8829b4f7 100644
--- a/lib/modules/browse/extension/extension_detail.dart
+++ b/lib/modules/browse/extension/extension_detail.dart
@@ -28,9 +28,15 @@ class ExtensionDetail extends ConsumerStatefulWidget {
 
 class _ExtensionDetailState extends ConsumerState<ExtensionDetail> {
   late Source source = isar.sources.getSync(widget.source.id!)!;
-  late List<SourcePreference> sourcePreference = getSourcePreference(
-    source: source,
-  ).map((e) => getSourcePreferenceEntry(e.key!, source.id!)).toList();
+  late List<SourcePreference>? sourcePreference = () {
+    try {
+      return getSourcePreference(
+        source: source,
+      ).map((e) => getSourcePreferenceEntry(e.key!, source.id!)).toList();
+    } catch (e) {
+      return null;
+    }
+  }();
   Future<void> _launchInBrowser(Uri url) async {
     if (!await launchUrl(url, mode: LaunchMode.externalApplication)) {
       throw 'Could not launch $url';
@@ -340,10 +346,11 @@ class _ExtensionDetailState extends ConsumerState<ExtensionDetail> {
                 ),
               ),
             ),
-            SourcePreferenceWidget(
-              sourcePreference: sourcePreference,
-              source: source,
-            ),
+            if (sourcePreference != null)
+              SourcePreferenceWidget(
+                sourcePreference: sourcePreference!,
+                source: source,
+              ),
           ],
         ),
       ),
diff --git a/lib/modules/browse/extension/widgets/create_extension.dart b/lib/modules/browse/extension/widgets/create_extension.dart
index 49db1299..baf77f6b 100644
--- a/lib/modules/browse/extension/widgets/create_extension.dart
+++ b/lib/modules/browse/extension/widgets/create_extension.dart
@@ -305,7 +305,7 @@ class TestSource extends MProvider {
 
   MSource source;
 
-  final Client client = Client(source);
+  final Client client = Client();
 
   @override
   bool get supportsLatest => true;