diff --git a/flutter b/flutter
index 9944297..4d9e56e 160000
--- a/flutter
+++ b/flutter
@@ -1 +1 @@
-Subproject commit 9944297138845a94256f1cf37beb88ff9a8e811a
+Subproject commit 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
diff --git a/lib/main.dart b/lib/main.dart
index 3eca615..1a12fe5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dynamic_color/dynamic_color.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
@@ -47,6 +48,7 @@ import 'package:paperless_mobile/theme.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+import 'package:mock_server/mock_server.dart';
 
 String get defaultPreferredLocaleSubtag {
   String preferredLocale = Platform.localeName.split("_").first;
@@ -72,6 +74,9 @@ Future<void> _initHive() async {
 }
 
 void main() async {
+  if (kDebugMode) {
+    await LocalMockApiServer().start();
+  }
   await _initHive();
   final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
   final globalSettingsBox = Hive.box<GlobalSettings>(HiveBoxes.globalSettings);
diff --git a/lib/main_dev.dart b/lib/main_dev.dart
deleted file mode 100644
index 5fb095a..0000000
--- a/lib/main_dev.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-import 'package:mock_server/mock_server.dart';
-import 'package:paperless_mobile/main.dart' as ParentMain;
-
-void main() async {
-  await LocalMockApiServer().start();
-  ParentMain.main();
-}
-
diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh
index a01ac8c..82ef584 100755
--- a/scripts/install_dependencies.sh
+++ b/scripts/install_dependencies.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 pushd ../
 pushd packages/paperless_api
-flutter pub get
+flutter packages pub get
 dart run build_runner build --delete-conflicting-outputs
 popd
+pushd packages/mock_server
+flutter packages pub get
+popd
 flutter packages pub get
 flutter gen-l10n
 dart run build_runner build --delete-conflicting-outputs