diff --git a/android/app/src/main/java/com/keyboardcrumbs/hassclient/LocationUtils.java b/android/app/src/main/java/com/keyboardcrumbs/hassclient/LocationUtils.java
index 60521e7..41508b9 100644
--- a/android/app/src/main/java/com/keyboardcrumbs/hassclient/LocationUtils.java
+++ b/android/app/src/main/java/com/keyboardcrumbs/hassclient/LocationUtils.java
@@ -38,7 +38,7 @@ class LocationUtils {
     static final long MIN_WORKER_LOCATION_UPDATE_INTERVAL_MS = 900000; //15 minutes
 
     static int getLocationUpdatesState(Context context) {
-        return context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE).getInt(KEY_REQUESTING_LOCATION_UPDATES, LOCATION_UPDATES_DISABLED);
+        return (int) context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE).getInt(KEY_REQUESTING_LOCATION_UPDATES, LOCATION_UPDATES_DISABLED);
     }
 
     static long getLocationUpdateIntervals(Context context) {
diff --git a/lib/pages/settings/integration_settings.part.dart b/lib/pages/settings/integration_settings.part.dart
index 972f704..e3f7705 100644
--- a/lib/pages/settings/integration_settings.part.dart
+++ b/lib/pages/settings/integration_settings.part.dart
@@ -97,10 +97,13 @@ class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
   }
 
   _switchLocationTrackingState(bool state) async {
-    await AppSettings().save({'location-updates-interval': _locationInterval.inSeconds, 'location-updates-priority': _accuracy, 'location-updates-show-notification': _showNotification});
     if (state) {
       try {
-        await platform.invokeMethod('startLocationService');
+        await platform.invokeMethod('startLocationService', <String, dynamic>{
+          'location-updates-interval': _locationInterval.inSeconds,
+          'location-updates-priority': _accuracy,
+          'location-updates-show-notification': _showNotification
+        });
       } catch (e) {
         _locationTrackingEnabled = false;
       }
diff --git a/pubspec.yaml b/pubspec.yaml
index a157e62..3797369 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 1.3.0+1302
+version: 1.3.0+1303
 
 
 environment: