diff --git a/lib/eval/dart/service.dart b/lib/eval/dart/service.dart
index 004a51df..a8530d5b 100644
--- a/lib/eval/dart/service.dart
+++ b/lib/eval/dart/service.dart
@@ -21,13 +21,7 @@ class DartExtensionService implements ExtensionService {
     final interpreter = D4rt();
     RegistrerBridge.registerBridge(interpreter);
 
-    interpreter.execute(
-      source.sourceCode!.replaceAll(
-        "final Client client = Client(source)",
-        "final Client client = Client()",
-      ),
-      mainArgs: source.toMSource(),
-    );
+    interpreter.execute(source.sourceCode!, mainArgs: source.toMSource());
     return interpreter;
   }
 
diff --git a/lib/modules/manga/detail/providers/update_manga_detail_providers.dart b/lib/modules/manga/detail/providers/update_manga_detail_providers.dart
index 3b02dae0..0f7a9e3b 100644
--- a/lib/modules/manga/detail/providers/update_manga_detail_providers.dart
+++ b/lib/modules/manga/detail/providers/update_manga_detail_providers.dart
@@ -49,7 +49,9 @@ Future<dynamic> updateMangaDetail(
     ..artist =
         getManga.artist?.trim().trimLeft().trimRight() ?? manga.artist ?? ""
     ..status =
-        getManga.status == Status.unknown ? manga.status : getManga.status!
+        getManga.status == Status.unknown
+            ? manga.status
+            : getManga.status ?? Status.unknown
     ..description =
         getManga.description?.trim().trimLeft().trimRight() ??
         manga.description ??