diff --git a/app/src/frontend/route.tsx b/app/src/frontend/route.tsx
index 1d595d22..c43beae9 100644
--- a/app/src/frontend/route.tsx
+++ b/app/src/frontend/route.tsx
@@ -39,7 +39,7 @@ export const AuthRoute: React.FC<RouteProps> = ({ component: Component, children
             if(isAuthenticated) {
                 let state = props.location.state as any;
                 let from = '/my-account.html';
-                if (typeof state == 'object' && 'from' in state){
+                if (typeof state == 'object' && state !== null && 'from' in state) {
                     from = state.from;
                 }