diff --git a/jsapp/js/components/map.es6 b/jsapp/js/components/map.es6
index b81059bbdb..d719db361d 100644
--- a/jsapp/js/components/map.es6
+++ b/jsapp/js/components/map.es6
@@ -330,9 +330,10 @@ export class FormMap extends React.Component {
           });
         }
 
-        this.setState({submissions: results});
-        this.buildMarkers(map);
-        this.buildHeatMap(map);
+        this.setState({submissions: results}, () => {
+          this.buildMarkers(map);
+          this.buildHeatMap(map);
+        });
       })
       .fail((error) => {
         if (error.responseText) {