diff --git a/app/src/main/java/org/tasks/data/TaskAttachmentDao.java b/app/src/main/java/org/tasks/data/TaskAttachmentDao.java
index 2b78b6792..23f90d72d 100644
--- a/app/src/main/java/org/tasks/data/TaskAttachmentDao.java
+++ b/app/src/main/java/org/tasks/data/TaskAttachmentDao.java
@@ -17,7 +17,7 @@ public abstract class TaskAttachmentDao {
   public abstract List<TaskAttachment> getAttachments(String taskUuid);
 
   @Query(
-      "SELECT * FROM task_attachments INNER JOIN tasks ON tasks._id = :task WHERE task_id = tasks.remoteId")
+      "SELECT task_attachments.* FROM task_attachments INNER JOIN tasks ON tasks._id = :task WHERE task_id = tasks.remoteId")
   public abstract List<TaskAttachment> getAttachments(long task);
 
   @Query("SELECT * FROM task_attachments")
diff --git a/app/src/main/java/org/tasks/data/UserActivityDao.java b/app/src/main/java/org/tasks/data/UserActivityDao.java
index 25e8679d0..4dcc1f258 100644
--- a/app/src/main/java/org/tasks/data/UserActivityDao.java
+++ b/app/src/main/java/org/tasks/data/UserActivityDao.java
@@ -26,7 +26,7 @@ public abstract class UserActivityDao {
   public abstract List<UserActivity> getCommentsForTask(String taskUuid);
 
   @Query(
-      "SELECT * FROM userActivity INNER JOIN tasks ON tasks._id = :task WHERE target_id = tasks.remoteId")
+      "SELECT userActivity.* FROM userActivity INNER JOIN tasks ON tasks._id = :task WHERE target_id = tasks.remoteId")
   public abstract List<UserActivity> getComments(long task);
 
   @Query("SELECT * FROM userActivity")