diff --git a/src/compat/firestore/collection-group/collection-group.ts b/src/compat/firestore/collection-group/collection-group.ts
index 0bb815537..06162ed13 100644
--- a/src/compat/firestore/collection-group/collection-group.ts
+++ b/src/compat/firestore/collection-group/collection-group.ts
@@ -2,7 +2,7 @@ import { from, Observable } from 'rxjs';
 import { fromCollectionRef } from '../observable/fromRef';
 import { filter, map, scan } from 'rxjs/operators';
 import firebase from 'firebase/compat/app';
-import { keepUnstableUntilFirst, observeInsideAngular } from '@angular/fire';
+import { keepUnstableUntilFirst } from '@angular/fire';
 
 import { DocumentChangeAction, DocumentChangeType, DocumentData, Query } from '../interfaces';
 import { validateEventsArray } from '../collection/collection';
@@ -108,7 +108,7 @@ export class AngularFirestoreCollectionGroup<T = DocumentData> {
    */
   get(options?: firebase.firestore.GetOptions) {
     return from(this.query.get(options)).pipe(
-      observeInsideAngular
+      keepUnstableUntilFirst
     );
   }
 
diff --git a/src/compat/firestore/collection/collection.ts b/src/compat/firestore/collection/collection.ts
index ffe7e223c..f873441ad 100644
--- a/src/compat/firestore/collection/collection.ts
+++ b/src/compat/firestore/collection/collection.ts
@@ -1,7 +1,7 @@
 import { from, Observable } from 'rxjs';
 import { filter, map, pairwise, scan, startWith } from 'rxjs/operators';
 import firebase from 'firebase/compat/app';
-import { keepUnstableUntilFirst, observeInsideAngular } from '@angular/fire';
+import { keepUnstableUntilFirst } from '@angular/fire';
 
 import { CollectionReference, DocumentChangeAction, DocumentChangeType, DocumentData, DocumentReference, Query } from '../interfaces';
 import { docChanges, sortedChanges } from './changes';
@@ -129,7 +129,7 @@ export class AngularFirestoreCollection<T = DocumentData> {
    */
   get(options?: firebase.firestore.GetOptions) {
     return from(this.query.get(options)).pipe(
-      observeInsideAngular,
+      keepUnstableUntilFirst,
     );
   }
 
diff --git a/src/compat/firestore/document/document.ts b/src/compat/firestore/document/document.ts
index b4b644aef..bc4b551f4 100644
--- a/src/compat/firestore/document/document.ts
+++ b/src/compat/firestore/document/document.ts
@@ -2,7 +2,7 @@ import { from, Observable } from 'rxjs';
 import { keepUnstableUntilFirst } from '@angular/fire';
 import { Action, DocumentData, DocumentReference, DocumentSnapshot, QueryFn, SetOptions } from '../interfaces';
 import { fromDocRef } from '../observable/fromRef';
-import { map, observeOn } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { AngularFirestore, associateQuery } from '../firestore';
 import { AngularFirestoreCollection } from '../collection/collection';
 import firebase from 'firebase/compat/app';
@@ -102,7 +102,7 @@ export class AngularFirestoreDocument<T = DocumentData> {
    */
   get(options?: firebase.firestore.GetOptions) {
     return from(this.ref.get(options)).pipe(
-      observeOn(this.afs.schedulers.insideAngular),
+      keepUnstableUntilFirst,
     );
   }
 }