diff --git a/src/main/java/com/vaadin/starter/bakery/ui/views/login/LoginView.java b/src/main/java/com/vaadin/starter/bakery/ui/views/login/LoginView.java
index a015b7bb7..86115f766 100644
--- a/src/main/java/com/vaadin/starter/bakery/ui/views/login/LoginView.java
+++ b/src/main/java/com/vaadin/starter/bakery/ui/views/login/LoginView.java
@@ -33,8 +33,7 @@ public void configurePage(InitialPageSettings settings) {
 		// Force login page to use Shady DOM to avoid problems with browsers and
 		// password managers not supporting shadow DOM
 		settings.addInlineWithContents(InitialPageSettings.Position.PREPEND,
-				"window.customElements=window.customElements||{};" +
-						"window.customElements.forcePolyfill=true;" +
+				"if (window.customElements) { window.customElements.forcePolyfill = true; }" +
 						"window.ShadyDOM={force:true};", InitialPageSettings.WrapMode.JAVASCRIPT);
 	}