diff --git a/FirebaseDatabaseUI/FUIQueryObserver.m b/FirebaseDatabaseUI/FUIQueryObserver.m
index 456e48217fb..e35402839ac 100644
--- a/FirebaseDatabaseUI/FUIQueryObserver.m
+++ b/FirebaseDatabaseUI/FUIQueryObserver.m
@@ -58,8 +58,6 @@ + (FUIQueryObserver *)observerForQuery:(id<FUIDataObservable>)query
     completion(obs, nil, error);
   };
 
-  [obs observeEventType:FIRDataEventTypeChildAdded
-    andPreviousSiblingKeyWithBlock:observerBlock withCancelBlock:cancelBlock];
   [obs observeEventType:FIRDataEventTypeValue
     andPreviousSiblingKeyWithBlock:observerBlock withCancelBlock:cancelBlock];
   return obs;
diff --git a/FirebaseDatabaseUITests/FUIDatabaseTestUtils.m b/FirebaseDatabaseUITests/FUIDatabaseTestUtils.m
index a3c9cd75673..6ee490fe528 100644
--- a/FirebaseDatabaseUITests/FUIDatabaseTestUtils.m
+++ b/FirebaseDatabaseUITests/FUIDatabaseTestUtils.m
@@ -176,6 +176,11 @@ - (FIRDatabaseHandle)observeEventType:(FIRDataEventType)eventType
       id value = self.contents[contentKey];
       FUIFakeSnapshot *snap = [[FUIFakeSnapshot alloc] initWithKey:contentKey value:value];
       [self sendEvent:FIRDataEventTypeChildAdded withObject:snap previousKey:previousKey error:nil];
+
+      // Send a value event, since this is a complete snapshot.
+      // TODO: FUIFakeSnapshot currently only represents dictionary types, though snapshots can
+      // have array, string, or number values as well. Tests need to be written for these.
+      [self sendEvent:FIRDataEventTypeValue withObject:snap previousKey:previousKey error:nil];
       previousKey = contentKey;
     }
   }
diff --git a/FirebaseDatabaseUITests/FUIIndexArrayTest.m b/FirebaseDatabaseUITests/FUIIndexArrayTest.m
index e189076b9af..1bf036d9377 100644
--- a/FirebaseDatabaseUITests/FUIIndexArrayTest.m
+++ b/FirebaseDatabaseUITests/FUIIndexArrayTest.m
@@ -60,7 +60,7 @@ - (void)setUp {
   self.index = [[FUITestObservable alloc] initWithDictionary:database()[@"index"]];
   self.data = [[FUITestObservable alloc] initWithDictionary:database()[@"data"]];
   self.array = [[FUIIndexArray alloc] initWithIndex:self.index
-                                                    data:self.data];
+                                               data:self.data];
   self.arrayDelegate = [[FUIIndexArrayTestDelegate alloc] init];
   self.array.delegate = self.arrayDelegate;
   self.dict = [database() mutableCopy];