diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
index 2db1b5a7..f94a6f16 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
@@ -160,7 +160,7 @@ public class OpenScale {
 
     public void selectScaleUser(int userId) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putInt("selectedUserId", userId).commit();
+        prefs.edit().putInt("selectedUserId", userId).apply();
 
         selectedScaleUser = null;
     }
@@ -421,7 +421,7 @@ public class OpenScale {
 
     public void clearScaleData(int userId) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putInt("uniqueNumber", 0x00).commit();
+        prefs.edit().putInt("uniqueNumber", 0x00).apply();
         measurementDAO.deleteAll(userId);
 
         updateScaleData();
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
index ee39edf1..c5e02178 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
@@ -277,7 +277,7 @@ public class BluetoothMiScale extends BluetoothCommunication {
             Random r = new Random();
             uniqueNumber = r.nextInt(65535 - 100 + 1) + 100;
 
-            prefs.edit().putInt("uniqueNumber", uniqueNumber).commit();
+            prefs.edit().putInt("uniqueNumber", uniqueNumber).apply();
         }
 
         int userId = OpenScale.getInstance(context).getSelectedScaleUserId();
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java
index 384fc2f6..5e9ad0e3 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java
@@ -248,7 +248,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication {
             Random r = new Random();
             uniqueNumber = r.nextInt(65535 - 100 + 1) + 100;
 
-            prefs.edit().putInt("uniqueNumber", uniqueNumber).commit();
+            prefs.edit().putInt("uniqueNumber", uniqueNumber).apply();
         }
 
         int userId = OpenScale.getInstance(context).getSelectedScaleUserId();
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java
index 9502c3e3..7f1ae210 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java
@@ -146,7 +146,7 @@ public class BluetoothYunmaiSE_Mini extends BluetoothCommunication {
             Random r = new Random();
             uniqueNumber = r.nextInt(65535 - 100 + 1) + 100;
 
-            prefs.edit().putInt("uniqueNumber", uniqueNumber).commit();
+            prefs.edit().putInt("uniqueNumber", uniqueNumber).apply();
         }
 
         int userId = OpenScale.getInstance(context).getSelectedScaleUserId();
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
index 94a1797d..0a841f7f 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
@@ -146,7 +146,7 @@ public class MainActivity extends BaseAppCompatActivity
             intent.putExtra(UserSettingsActivity.EXTRA_MODE, UserSettingsActivity.ADD_USER_REQUEST);
             startActivity(intent);
 
-            prefs.edit().putBoolean("firstStart", false).commit();
+            prefs.edit().putBoolean("firstStart", false).apply();
         }
 
         if(!valueOfCountModified){
@@ -301,7 +301,7 @@ public class MainActivity extends BaseAppCompatActivity
                 return;
         }
 
-        prefs.edit().putInt("lastFragmentId", menuItemId).commit();
+        prefs.edit().putInt("lastFragmentId", menuItemId).apply();
 
         FragmentManager fragmentManager = getSupportFragmentManager();
 
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
index 2e981a94..5acb0f58 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
@@ -188,10 +188,10 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
                     case R.id.enableMonth:
                         if (item.isChecked()) {
                             item.setChecked(false);
-                            prefs.edit().putBoolean("showMonth", false).commit();
+                            prefs.edit().putBoolean("showMonth", false).apply();
                         } else {
                             item.setChecked(true);
-                            prefs.edit().putBoolean("showMonth", true).commit();
+                            prefs.edit().putBoolean("showMonth", true).apply();
                         }
 
                         generateGraphs();
@@ -199,10 +199,10 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
                     case R.id.enableWeek:
                         if (item.isChecked()) {
                             item.setChecked(false);
-                            prefs.edit().putBoolean("showWeek", false).commit();
+                            prefs.edit().putBoolean("showWeek", false).apply();
                         } else {
                             item.setChecked(true);
-                            prefs.edit().putBoolean("showWeek", true).commit();
+                            prefs.edit().putBoolean("showWeek", true).apply();
                         }
 
                         generateGraphs();
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
index a8add33a..0c555525 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
@@ -154,7 +154,7 @@ public abstract class MeasurementView extends TableLayout {
         }
         PreferenceManager.getDefaultSharedPreferences(context).edit()
                 .putString(PREF_MEASUREMENT_ORDER, TextUtils.join(",", order))
-                .commit();
+                .apply();
     }
 
     private void initView(Context context) {