diff --git a/packages/docs/src/service-worker.js b/packages/docs/src/service-worker.js
index 4150b487642..f3831593c51 100644
--- a/packages/docs/src/service-worker.js
+++ b/packages/docs/src/service-worker.js
@@ -1,16 +1,23 @@
 // Imports
-import { precacheAndRoute, matchPrecache } from 'workbox-precaching'
-import { registerRoute, setDefaultHandler, setCatchHandler } from 'workbox-routing'
-import { NetworkOnly, CacheFirst } from 'workbox-strategies'
+import { matchPrecache, precacheAndRoute } from 'workbox-precaching'
+import { registerRoute, setCatchHandler, setDefaultHandler } from 'workbox-routing'
+import { NetworkOnly } from 'workbox-strategies'
 
 precacheAndRoute(self.__WB_MANIFEST)
 
-const cacheFirst = new CacheFirst()
 const networkOnly = new NetworkOnly()
 
 registerRoute(
-  ({ url, request }) => url.origin === self.location.origin && request.destination !== 'document',
-  cacheFirst
+  ({ url, request }) => url.origin === self.location.origin && request.destination === 'document',
+  async options => {
+    const { url } = options
+    const fallback = await getFallbackDocument(url)
+    if (fallback) {
+      console.log(`[SW] serving fallback for ${url.pathname}`)
+    }
+
+    return fallback ?? networkOnly.handle(options)
+  }
 )
 
 setDefaultHandler(networkOnly)
@@ -20,7 +27,7 @@ setCatchHandler(async ({ url, request }) => {
     url.origin === self.location.origin &&
     request.destination === 'document'
   ) {
-    return matchPrecache(url.pathname.startsWith('/eo-UY/') ? '_crowdin.html' : '/_fallback.html')
+    return getFallbackDocument(url)
   }
 
   return Response.error()
@@ -29,3 +36,7 @@ setCatchHandler(async ({ url, request }) => {
 self.addEventListener('message', event => {
   if (event.data === 'sw:update') self.skipWaiting()
 })
+
+function getFallbackDocument (url) {
+  return matchPrecache(url.pathname.startsWith('/eo-UY/') ? '_crowdin.html' : '/_fallback.html')
+}