diff --git a/src/core/angularfire2.spec.ts b/src/core/angularfire2.spec.ts
index 4a6752a8b..f59b02394 100644
--- a/src/core/angularfire2.spec.ts
+++ b/src/core/angularfire2.spec.ts
@@ -3,7 +3,7 @@ import { Reference } from '@firebase/database-types';
 import { TestBed, inject, withModule, async } from '@angular/core/testing';
 import { ReflectiveInjector, Provider, PlatformRef, NgModule, Compiler, ApplicationRef, CompilerFactory } from '@angular/core';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { COMMON_CONFIG } from './test-config';
 import { BrowserModule } from '@angular/platform-browser';
 
diff --git a/src/core/angularfire2.ts b/src/core/angularfire2.ts
index 5590ecccf..d0f2cee9e 100644
--- a/src/core/angularfire2.ts
+++ b/src/core/angularfire2.ts
@@ -1,15 +1,13 @@
 import { InjectionToken, NgZone } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Subscription } from 'rxjs/Subscription';
-import { queue } from 'rxjs/scheduler/queue';
 import { isPlatformServer } from '@angular/common';
-import { observeOn } from 'rxjs/operator/observeOn';
+import { Observable, Subscription } from 'rxjs';
+import { queue } from 'rxjs/scheduler/queue';
+import { first } from 'rxjs/operators';
 
 import firebase from '@firebase/app';
 import { FirebaseApp, FirebaseOptions } from '@firebase/app-types';
 
 import {} from 'zone.js';
-import 'rxjs/add/operator/first';
 
 export const FirebaseAppName = new InjectionToken<string>('angularfire2.appName');
 export const FirebaseAppConfig = new InjectionToken<FirebaseOptions>('angularfire2.config');
@@ -28,7 +26,7 @@ export class FirebaseZoneScheduler {
       return new Observable<T>(subscriber => {
         const noop = () => {};
         const task = Zone.current.scheduleMacroTask('firebaseZoneBlock', noop, {}, noop, noop);
-        obs$.first().subscribe(() => this.zone.runOutsideAngular(() => task.invoke()));
+        obs$.pipe(first()).subscribe(() => this.zone.runOutsideAngular(() => task.invoke()));
         return obs$.subscribe(subscriber);
       });
     } else {