diff --git a/lib/app/client.js b/lib/app/client.js
index 4c2d9ff978..42fe801818 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -24,7 +24,7 @@ function mapTransitions(Components, to, from) {
     const transitions = Object.assign({}, to ? resolveRoute(to) : resolveTransitions(Component))
     const from_transitions = from ? resolveRoute(from) : {}
     // Combine transitions & prefer leave* transitions of from route
-    Object.keys(from_transitions).forEach(key=> {
+    Object.keys(from_transitions || {}).forEach(key=> {
       if (from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
         transitions[key] = from_transitions[key]
       }