diff --git a/src/OHIFStandaloneViewer.js b/src/OHIFStandaloneViewer.js
index 7c17347f2..b08b5e72c 100644
--- a/src/OHIFStandaloneViewer.js
+++ b/src/OHIFStandaloneViewer.js
@@ -188,7 +188,7 @@ class OHIFStandaloneViewer extends Component {
                     this.setState({ isLoading: false });
                   }}
                 >
-                  {match === null ? <></> : <Component match={match} />}
+                  {match === null ? <></> : <Component match={match} location={this.props.location}/>}
                 </CSSTransition>
               )}
             </Route>
diff --git a/src/routes/StandaloneRouting.js b/src/routes/StandaloneRouting.js
index 622f68625..075f1c2f1 100644
--- a/src/routes/StandaloneRouting.js
+++ b/src/routes/StandaloneRouting.js
@@ -90,7 +90,12 @@ class StandaloneRouting extends Component {
 
   async componentDidMount() {
     try {
-      const query = qs.parse(this.props.location.search);
+      let { search } = this.props.location;
+
+      // Remove ? prefix which is included for some reason
+      search = search.slice(1, search.length);
+
+      const query = qs.parse(search);
       const studies = await StandaloneRouting.parseQueryAndFetchStudies(query);
 
       studyMetadataManager.purge();