diff --git a/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.java b/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.java
index 773fef19dd7..71f5ec4733a 100644
--- a/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.java
+++ b/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.java
@@ -315,7 +315,7 @@ private static String[] listLocalFile(String path, String suffix) {
       }
       return result;
     }
-    return null;
+    return new String[] {};
   }
 
   private void setupModelTypeSelectorDialog() {
@@ -343,8 +343,10 @@ private void setupModelTypeSelectorDialog() {
 
   private void setupTokenizerSelectorDialog() {
     String[] binFiles = listLocalFile("/data/local/tmp/llama/", ".bin");
-    String[] tokenizerFiles = new String[binFiles.length];
+    String[] modelFiles = listLocalFile("/data/local/tmp/llama/", ".model");
+    String[] tokenizerFiles = new String[binFiles.length + modelFiles.length];
     System.arraycopy(binFiles, 0, tokenizerFiles, 0, binFiles.length);
+    System.arraycopy(modelFiles, 0, tokenizerFiles, binFiles.length, modelFiles.length);
     AlertDialog.Builder tokenizerPathBuilder = new AlertDialog.Builder(this);
     tokenizerPathBuilder.setTitle("Select tokenizer path");
     tokenizerPathBuilder.setSingleChoiceItems(