diff --git a/.travis.yml b/.travis.yml
index c350d34cc..a214e9198 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,37 +6,12 @@ node_js:
 addons:
   chrome: stable
 
-cache:
-  yarn: true
-  directories:
-    - node_modules
-    - "$HOME/.npm"
-    - "$HOME/.cache"
-
-env:
-  - CANARY=false
-  - CANARY=true
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: CANARY=true
-
 branches:
   only:
     - master # otherwise pull requests get built twice
+    - v5
 
-install:
-  - |
-    if $CANARY; then
-      yarn upgrade && yarn add firebase@canary
-    else
-      if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
-        yarn upgrade
-      else
-        yarn install --frozen-lockfile
-      fi
-    fi
+install: yarn install --frozen-lockfile
 
 script:
   - yarn build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8e1dd49f..4d28cd125 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="5.4.2"></a>
+## [5.4.2](https://github.com/angular/angularfire2/compare/5.4.1...5.4.2) (2020-02-06)
+
+
+### Bug Fixes
+
+* **core:** fixing a problem with hot/cold observables resulting in missed events ([#2315](https://github.com/angular/angularfire2/issues/2315)) ([6dd0409](https://github.com/angular/angularfire2/commit/6dd0409))
+
+
 <a name="5.4.1"></a>
 ## [5.4.1](https://github.com/angular/angularfire2/compare/5.4.0...5.4.1) (2020-02-05)
 
diff --git a/package.json b/package.json
index d71f62dff..0335258e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular/fire",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "The official library of Firebase and Angular.",
   "private": true,
   "scripts": {
diff --git a/src/core/angularfire2.ts b/src/core/angularfire2.ts
index 39c0c1b2d..ce1430757 100644
--- a/src/core/angularfire2.ts
+++ b/src/core/angularfire2.ts
@@ -90,8 +90,9 @@ export function ɵkeepUnstableUntilFirstFactory(
       // Run the subscribe body outside of Angular (e.g. calling Firebase SDK to add a listener to a change event)
       subscribeOn(schedulers.outsideAngular),
       // Run operators inside the angular zone (e.g. side effects via tap())
-      observeOn(schedulers.insideAngular),
-      share()
+      observeOn(schedulers.insideAngular)
+      // This isn't working correctly #2309, #2314, #2312
+      // share()
     );
   }
 }