diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
index a44b10a92..fdb53ac4c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
@@ -280,7 +280,7 @@ public class PasswordRepository {
         }
 
         public static PasswordSortOrder getSortOrder(SharedPreferences settings) {
-            return valueOf(settings.getString("sort_order", null));
+            return valueOf(settings.getString("sort_order", FOLDER_FIRST.name()));
         }
     }
 }