diff --git a/app/lib/service.dart b/app/lib/service.dart
index 705aa3ad..d6c4add9 100644
--- a/app/lib/service.dart
+++ b/app/lib/service.dart
@@ -56,6 +56,7 @@ void stopService() {
 }
 
 @visibleForTesting
+@pragma("vm:entry-point")
 Future<void> serviceMain() async {
   _Service._shouldRun.value = true;
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/app/lib/use_case/startup_sync.dart b/app/lib/use_case/startup_sync.dart
index 902b0782..1c45b5fd 100644
--- a/app/lib/use_case/startup_sync.dart
+++ b/app/lib/use_case/startup_sync.dart
@@ -109,6 +109,7 @@ class _IsolateMessage {
   final Account account;
 }
 
+@pragma("vm:entry-point")
 Future<JsonObj> _isolateMain(JsonObj messageJson) async {
   final message = _IsolateMessage.fromJson(messageJson);
   await app_init.init(app_init.InitIsolateType.flutterIsolate);
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 2d3a1b44..63fe05a0 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -507,12 +507,10 @@ packages:
   flutter_isolate:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "2.0.2-nc-photos-1"
-      resolved-ref: "8d8516b169860caba762baed43a7888798c5b7d7"
-      url: "https://gitlab.com/nc-photos/flutter_isolate.git"
-    source: git
-    version: "2.0.2"
+      name: flutter_isolate
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.4"
   flutter_keyboard_visibility:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index aa579bbf..7f0215b2 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -59,10 +59,7 @@ dependencies:
       ref: v0.2.6-nc-photos-2
   flutter_bloc: ^8.0.0
   flutter_colorpicker: ^1.0.3
-  flutter_isolate:
-    git:
-      url: https://gitlab.com/nc-photos/flutter_isolate.git
-      ref: 2.0.2-nc-photos-1
+  flutter_isolate: ^2.0.4
   flutter_map: ^1.1.1
   flutter_staggered_grid_view:
     git: