diff --git a/frontend/src/App/App.jsx b/frontend/src/App/App.jsx
index 5958d6ea70..940f96e00b 100644
--- a/frontend/src/App/App.jsx
+++ b/frontend/src/App/App.jsx
@@ -178,7 +178,7 @@ class AppComponent extends React.Component {
               />
               <Route
                 exact
-                path="/applications/:slug/:pageHandle?"
+                path="/applications/:slug/:pageHandle?/*"
                 element={
                   <PrivateRoute>
                     <Viewer switchDarkMode={this.switchDarkMode} darkMode={darkMode} />
diff --git a/frontend/src/Editor/Viewer.jsx b/frontend/src/Editor/Viewer.jsx
index 87f5bc0fa5..f1e431fa77 100644
--- a/frontend/src/Editor/Viewer.jsx
+++ b/frontend/src/Editor/Viewer.jsx
@@ -533,7 +533,7 @@ class ViewerComponent extends React.Component {
     } = this.state;
 
     const currentCanvasWidth = canvasWidth;
-    const queryConfirmationList = this.props.queryConfirmationList;
+    const queryConfirmationList = this.props?.queryConfirmationList ?? [];
 
     const canvasMaxWidth = this.computeCanvasMaxWidth();