diff --git a/aio/firebase.json b/aio/firebase.json
index 0b2c2232be..b4710b8c87 100644
--- a/aio/firebase.json
+++ b/aio/firebase.json
@@ -7,7 +7,8 @@
     "cleanUrls": true,
     "redirects": [
       // cli-quickstart.html glossary.html, quickstart.html, http.html, style-guide.html, styleguide
-      {"type": 301, "source": "/docs/ts/latest/cli-quickstart.html",             "destination": "/guide/cli-quickstart"},
+      {"type": 301, "source": "/docs/ts/latest/cli-quickstart.html",             "destination": "/guide/quickstart"},
+      {"type": 301, "source": "/guide/cli-quickstart",                           "destination": "/guide/quickstart"},
       {"type": 301, "source": "/docs/ts/latest/glossary.html",                   "destination": "/guide/glossary"},
       {"type": 301, "source": "/docs/ts/latest/quickstart.html",                 "destination": "/guide/quickstart"},
       {"type": 301, "source": "/docs/ts/latest/guide/server-communication.html", "destination": "/guide/http"},
diff --git a/aio/ngsw-manifest.json b/aio/ngsw-manifest.json
index d79a123644..3ba52966f7 100644
--- a/aio/ngsw-manifest.json
+++ b/aio/ngsw-manifest.json
@@ -19,7 +19,7 @@
   "routing": {
     "index": "/index.html",
     "routes": {
-      "^(?!/docs/ts/latest|/styleguide).*/(?!e?plnkr)[^/.]*$": {
+      "^(?!/docs/ts/latest|/guide/cli-quickstart|/styleguide).*/(?!e?plnkr)[^/.]*$": {
         "match": "regex"
       }
     }