diff --git a/lib/geolocation_service.dart b/lib/geolocation_service.dart
index ff82bf1..af9624e 100644
--- a/lib/geolocation_service.dart
+++ b/lib/geolocation_service.dart
@@ -3,6 +3,7 @@ import 'dart:developer' as developer;
 import 'dart:io';
 import 'dart:math';
 
+import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter_background_geolocation/flutter_background_geolocation.dart' as bg;
 import 'package:traccar_client/location_cache.dart';
@@ -115,7 +116,9 @@ class GeolocationService {
 
 @pragma('vm:entry-point')
 void headlessTask(bg.HeadlessEvent headlessEvent) async {
+  await Firebase.initializeApp();
   await Preferences.init();
+  FirebaseCrashlytics.instance.log('geolocation_headless:${headlessEvent.name}');
   switch (headlessEvent.name) {
     case bg.Event.ENABLEDCHANGE:
       await GeolocationService.onEnabledChange(headlessEvent.event);
diff --git a/lib/push_service.dart b/lib/push_service.dart
index f83ea8d..de8ff9f 100644
--- a/lib/push_service.dart
+++ b/lib/push_service.dart
@@ -1,6 +1,7 @@
 import 'dart:developer' as developer;
 import 'dart:io';
 
+import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_background_geolocation/flutter_background_geolocation.dart' as bg;
@@ -62,6 +63,7 @@ class PushService {
 
 @pragma('vm:entry-point')
 Future<void> pushServiceBackgroundHandler(RemoteMessage message) async {
+  await Firebase.initializeApp();
   await Preferences.init();
   await bg.BackgroundGeolocation.ready(Preferences.geolocationConfig());
   FirebaseCrashlytics.instance.log('push_background_handler');