firebase
diff --git a/‎packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift‎
Lines changed: 2 additions & 11 deletions b/‎packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift‎
Lines changed: 2 additions & 11 deletions
diff --git a/‎tests/integration_test/firebase_database/query_e2e.dart‎
Lines changed: 14 additions & 0 deletions b/‎tests/integration_test/firebase_database/query_e2e.dart‎
Lines changed: 14 additions & 0 deletions
@@ -389,7 +389,6 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
     let reference = database.reference(withPath: request.path)
 
     var query: DatabaseQuery = reference
-    var hasOrderModifier = false
     for modifier in request.modifiers {
       guard let type = modifier["type"] as? String else { continue }
 
@@ -400,17 +399,13 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
           case "orderByChild":
             if let path = modifier["path"] as? String {
               query = query.queryOrdered(byChild: path)
-              hasOrderModifier = true
             }
           case "orderByKey":
             query = query.queryOrderedByKey()
-            hasOrderModifier = true
           case "orderByValue":
             query = query.queryOrderedByValue()
-            hasOrderModifier = true
           case "orderByPriority":
             query = query.queryOrderedByPriority()
-            hasOrderModifier = true
           default:
             break
           }
@@ -422,17 +417,13 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug
           let key = modifier["key"] as? String
           switch name {
           case "startAt":
-            if !hasOrderModifier {
-              query = query.queryLimited(toFirst: 0)
-            } else if let key {
+            if let key {
               query = query.queryStarting(atValue: value, childKey: key)
             } else {
               query = query.queryStarting(atValue: value)
             }
           case "startAfter":
-            if !hasOrderModifier {
-              query = query.queryLimited(toFirst: 0)
-            } else if let key {
+            if let key {
               query = query.queryStarting(afterValue: value, childKey: key)
             } else {
               query = query.queryStarting(afterValue: value)
 
@@ -52,6 +52,20 @@ void setupQueryTests() {
         },
       );
 
+      test(
+        'onValue with startAt(value, key) and no orderBy should not crash',
+        () async {
+          await ref.set({
+            't1': {'timestamp': 1, 'value': 'old'},
+            't2': {'timestamp': 1000, 'value': 'current'},
+          });
+
+          final event = await ref.startAt(1000, key: 't2').onValue.first;
+
+          expect(event.type, DatabaseEventType.value);
+        },
+      );
+
       test('starts at the correct value', () async {
         await ref.set({
           'a': 1,