diff --git a/app/build.gradle b/app/build.gradle
index 50c5ec4c..785fca12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
 
 android {
     compileSdkVersion 30
diff --git a/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java b/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java
index 5805cceb..bedb2ca2 100644
--- a/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java
+++ b/app/src/main/java/com/cappielloantonio/play/database/dao/QueueDao.java
@@ -14,10 +14,10 @@ import java.util.List;
 
 @Dao
 public interface QueueDao {
-    @Query("SELECT * FROM song JOIN queue ON song.id = queue.id")
+    @Query("SELECT song.* FROM song JOIN queue ON song.id = queue.id")
     LiveData<List<Song>> getAll();
 
-    @Query("SELECT * FROM song JOIN queue ON song.id = queue.id")
+    @Query("SELECT song.* FROM song JOIN queue ON song.id = queue.id")
     List<Song> getAllSimple();
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)