diff --git a/client/on-demand-entries-client.js b/client/on-demand-entries-client.js
index a56e2a72..3c4d9d38 100644
--- a/client/on-demand-entries-client.js
+++ b/client/on-demand-entries-client.js
@@ -3,11 +3,9 @@
 import Router from '../lib/router'
 import fetch from 'unfetch'
 
-const originalRouteChangeComplete = Router.onRouteChangeComplete
-Router.onRouteChangeComplete = (...args) => {
-  if (originalRouteChangeComplete) originalRouteChangeComplete(...args)
-  ping()
-}
+Router.ready(() => {
+  Router.router.on('routeChangeComplete', ping)
+})
 
 async function ping () {
   try {