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 539c4997..e866f78a 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
@@ -229,11 +229,8 @@ public class OpenScale {
 		outputStream.close();
 	}
 
-	public void clearScaleData() {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        int selectedUserId  = prefs.getInt("selectedUserId", -1);
-
-		scaleDB.clearScaleData(selectedUserId);
+	public void clearScaleData(int userId) {
+		scaleDB.clearScaleData(userId);
 
         updateScaleData();
 	}
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
index e9427b4c..738237ad 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
@@ -277,7 +277,10 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
 
             deleteAllDialog.setPositiveButton(getResources().getString(R.string.label_yes), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int id) {
-                    OpenScale.getInstance(tableView.getContext()).clearScaleData();
+                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(tableView.getContext());
+                    int selectedUserId  = prefs.getInt("selectedUserId", -1);
+
+                    OpenScale.getInstance(tableView.getContext()).clearScaleData(selectedUserId);
 
                     Toast.makeText(tableView.getContext(), getResources().getString(R.string.info_data_all_deleted), Toast.LENGTH_SHORT).show();
                     updateOnView(OpenScale.getInstance(tableView.getContext()).getScaleDataList());
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/UserSettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/UserSettingsActivity.java
index a5d33bce..7671257c 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/UserSettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/UserSettingsActivity.java
@@ -157,7 +157,7 @@ public class UserSettingsActivity extends Activity {
 
                     OpenScale openScale = OpenScale.getInstance(context);
                     openScale.deleteScaleUser(userId);
-                    openScale.clearScaleData();
+                    openScale.clearScaleData(userId);
 
                     ArrayList<ScaleUser> scaleUser = openScale.getScaleUserList();