diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileSortOrderBySize.java b/app/src/main/java/com/nextcloud/talk/utils/FileSortOrderBySize.java
index 8d1a29d49..4eab78668 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/FileSortOrderBySize.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/FileSortOrderBySize.java
@@ -46,16 +46,13 @@ public class FileSortOrderBySize extends FileSortOrder {
 
         Collections.sort(files, (o1, o2) -> {
             if (!o1.getModel().isFile() && !o2.getModel().isFile()) {
-                Long obj1 = o1.getModel().size;
-                return multiplier * obj1.compareTo(o2.getModel().getSize());
+                return multiplier * Long.compare(o1.getModel().getSize(), o2.getModel().getSize());
             } else if (!o1.getModel().isFile()) {
                 return -1;
-
             } else if (!o2.getModel().isFile()) {
                 return 1;
             } else {
-                Long obj1 = o1.getModel().getSize();
-                return multiplier * obj1.compareTo(o2.getModel().getSize());
+                return multiplier * Long.compare(o1.getModel().getSize(), o2.getModel().getSize());
             }
         });