diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index aa125ed0..b754a2c6 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -892,8 +892,10 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                 }
                 break;
             case REPEAT_MODE_THIS:
-                if (force && newPosition < 0) {
-                    newPosition = getPlayingQueue().size() - 1;
+                if (force) {
+                    if (newPosition < 0) {
+                        newPosition = getPlayingQueue().size() - 1;
+                    }
                 } else {
                     newPosition = getPosition();
                 }
@@ -1194,6 +1196,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                     } else {
                         service.playNextSong(false);
                     }
+
                     sendEmptyMessage(RELEASE_WAKELOCK);
                     break;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java b/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java
index 62590fd7..f1ba45ba 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/QueryUtil.java
@@ -200,7 +200,7 @@ public class QueryUtil {
 
     private static void applySortMethod(ItemQuery query, String method) {
         // album activity will always sort by track number
-        if (query.getSortBy() != null) return;
+        if (query.getSortBy().length != 0) return;
 
         switch (method) {
             case SortMethod.NAME:
diff --git a/build.gradle b/build.gradle
index 96e498e4..436f3766 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
     }
 
     dependencies {
+        classpath 'com.android.tools:r8:1.6.84'
         classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }