diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleMeasurementDAO.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleMeasurementDAO.java
index 085c93e9..cdb09027 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleMeasurementDAO.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleMeasurementDAO.java
@@ -67,6 +67,6 @@ public interface ScaleMeasurementDAO {
     void deleteAll(int userId);
 
     // selectAll() is equivalent to getAll(), but returns a Cursor, for exposing via a ContentProvider.
-    @Query("SELECT * FROM scaleMeasurements WHERE userId = :userId AND enabled = 1 ORDER BY datetime DESC")
+    @Query("SELECT id as _ID, datetime, weight, fat, water, muscle FROM scaleMeasurements WHERE userId = :userId AND enabled = 1 ORDER BY datetime DESC")
     Cursor selectAll(int userId);
 }
diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDAO.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDAO.java
index 589ce496..3898681d 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDAO.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDAO.java
@@ -49,7 +49,7 @@ public interface ScaleUserDAO {
 
     // selectAll() and select() are equivalent to getall() and get(), but return a Cursor,
     // for exposing via a ContentProvider.
-    @Query("SELECT * FROM scaleUsers")
+    @Query("SELECT id as _ID, username, birthday, bodyHeight, gender, activityLevel FROM scaleUsers")
     Cursor selectAll();
 
     @Query("SELECT * FROM scaleUsers WHERE id = :id")