diff --git a/src/client/components/TopBar.js b/src/client/components/TopBar.js
index eea77f691f6d946111f40353aa5aecb43965eb67..4abf0830b0ee77c8e79b222746adb1c9b43ff3e5 100644
--- a/src/client/components/TopBar.js
+++ b/src/client/components/TopBar.js
@@ -67,6 +67,10 @@ class TopBar extends React.Component {
     anchorEl: null,
   };
 
+  componentDidMount() {
+    this.props.fetchManuscripts();
+  }
+
   handleClick = event => {
     this.setState({ anchorEl: event.currentTarget });
   };
@@ -160,6 +164,7 @@ TopBar.propTypes = {
   oneColumnView: PropTypes.bool.isRequired,
   mapMode: PropTypes.string.isRequired,
   resultFormat: PropTypes.string.isRequired,
+  fetchManuscripts: PropTypes.func.isRequired,
   updateResultFormat: PropTypes.func.isRequired,
   updateMapMode: PropTypes.func.isRequired,
   datasets: PropTypes.object.isRequired,
diff --git a/src/client/components/map/LeafletMap.js b/src/client/components/map/LeafletMap.js
index 781db8d25095aca2cd24be4f4c80d083b1150282..a2232403a89eda5c97a99629eb08220e0cfeeda8 100644
--- a/src/client/components/map/LeafletMap.js
+++ b/src/client/components/map/LeafletMap.js
@@ -34,7 +34,7 @@ const style = {
 class LeafletMap extends React.Component {
 
   componentDidMount() {
-    this.props.fetchManuscripts();
+    //this.props.fetchManuscripts();
     this.props.fetchPlaces();
 
     // Base layers
diff --git a/src/client/containers/MapApp.js b/src/client/containers/MapApp.js
index 882c2e2cfe739fb4fc4140694ee27a47cec88b1b..f6b51909be8e927ffe85178067b8edecdbdd1cb6 100644
--- a/src/client/containers/MapApp.js
+++ b/src/client/containers/MapApp.js
@@ -235,7 +235,7 @@ let MapApp = (props) => {
       case 'map': {
         mainResultsView = (
           <div className={classes.fullMap}>
-            {map}
+            {mapElement}
           </div>
         );
         break;
@@ -261,6 +261,7 @@ let MapApp = (props) => {
           resultFormat={options.resultFormat}
           updateMapMode={props.updateMapMode}
           updateResultFormat={props.updateResultFormat}
+          fetchManuscripts={props.fetchManuscripts}
           datasets={search.datasets}
           toggleDataset={props.toggleDataset}
         />