diff --git a/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java b/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
index 3d9d1c6..822743f 100644
--- a/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
+++ b/android/src/main/java/io/fullstack/firestack/FirestackDatabase.java
@@ -247,7 +247,7 @@ private Query getDatabaseQueryAtPathAndModifiers(final ReadableArray modifiers)
         query = query.limitToFirst(limit);
       } else if (methStr.contains("equalTo")) {
         String value = strArr[1];
-        String key = strArr[2];
+        String key = strArr.length >= 3 ? strArr[2] : null;
         if (key == null) {
           query = query.equalTo(value);
         } else {
@@ -255,7 +255,7 @@ private Query getDatabaseQueryAtPathAndModifiers(final ReadableArray modifiers)
         }
       } else if (methStr.contains("endAt")) {
         String value = strArr[1];
-        String key = strArr[2];
+        String key = strArr.length >= 3 ? strArr[2] : null;
         if (key == null) {
           query = query.endAt(value);
         } else {
@@ -263,7 +263,7 @@ private Query getDatabaseQueryAtPathAndModifiers(final ReadableArray modifiers)
         }
       } else if (methStr.contains("startAt")) {
         String value = strArr[1];
-        String key = strArr[2];
+        String key = strArr.length >= 3 ? strArr[2] : null;
         if (key == null) {
           query = query.startAt(value);
         } else {