diff --git a/polygerrit-ui/app/elements/gr-app-p2.html b/polygerrit-ui/app/elements/gr-app-p2.html
index 01727f377e..5bb8cb9ea7 100644
--- a/polygerrit-ui/app/elements/gr-app-p2.html
+++ b/polygerrit-ui/app/elements/gr-app-p2.html
@@ -21,9 +21,6 @@ limitations under the License.
 -->
 <script>
   window.Gerrit = window.Gerrit || {};
-
-  // Disable extra font load from paper-styles
-  window.polymerSkipLoadingFontRoboto = true;
 </script>
 
 <link rel="import" href="/bower_components/polymer/polymer.html">
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index a3364b42fa..a1078ea9c4 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -32,9 +32,6 @@ limitations under the License.
     }
   }
   window.Gerrit = window.Gerrit || {};
-
-  // Disable extra font load from paper-styles
-  window.polymerSkipLoadingFontRoboto = true;
 </script>
 
 <link rel="import" href="/bower_components/polymer/polymer.html">
diff --git a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
index 8598229b52..79b9c28c44 100644
--- a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
+++ b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
@@ -40,6 +40,8 @@
   </noscript>
 
   <script>
+    // Disable extra font load from paper-styles
+    window.polymerSkipLoadingFontRoboto = true;
     window.CLOSURE_NO_DEPS = true;
     // TODO(taoalpha): clean up once p2 fully rolled out
     {if $polymer2}window.POLYMER2 = true;{/if}