diff --git a/src/lib/project-fetcher-hoc.jsx b/src/lib/project-fetcher-hoc.jsx
index 10901d29fcdd5dc244cf6b3466c49cbea7ef7037..751339ba1a37fa859cca673689bff82a03bdbb33 100644
--- a/src/lib/project-fetcher-hoc.jsx
+++ b/src/lib/project-fetcher-hoc.jsx
@@ -43,16 +43,15 @@ const ProjectFetcherHOC = function (WrappedComponent) {
                 this.props.setInitialProjectId(props.projectId);
             }
         }
-        // NOTE: should this be componentWillUpdate or componentWillReceiveProps?
-        componentWillUpdate (nextProps) {
-            if (this.props.projectHost !== nextProps.projectHost) {
-                storage.setProjectHost(nextProps.projectHost);
+        componentDidUpdate (prevProps) {
+            if (prevProps.projectHost !== this.props.projectHost) {
+                storage.setProjectHost(this.props.projectHost);
             }
-            if (this.props.assetHost !== nextProps.assetHost) {
-                storage.setAssetHost(nextProps.assetHost);
+            if (prevProps.assetHost !== this.props.assetHost) {
+                storage.setAssetHost(this.props.assetHost);
             }
-            if (nextProps.isFetchingProjectWithId && !this.props.isFetchingProjectWithId) {
-                this.fetchProject(nextProps.reduxProjectId, nextProps.projectState);
+            if (this.props.isFetchingProjectWithId && !prevProps.isFetchingProjectWithId) {
+                this.fetchProject(this.props.reduxProjectId, this.props.projectState);
             }
         }
         fetchProject (projectId, projectState) {
diff --git a/src/lib/project-metadata-hoc.jsx b/src/lib/project-metadata-hoc.jsx
index 82a586e02738bd79d1245ca95dd01ff0dca668ec..53fec0ca4264c16ecebb8184ca40ab6e3b6ee494 100644
--- a/src/lib/project-metadata-hoc.jsx
+++ b/src/lib/project-metadata-hoc.jsx
@@ -21,9 +21,9 @@ const ProjectMetaDataHOC = function (WrappedComponent) {
             ]);
             this.updateProjectMetaData(props.projectId);
         }
-        componentWillReceiveProps (nextProps) {
-            if (nextProps.isFetchingProjectWithId && !this.props.isFetchingProjectWithId) {
-                this.updateProjectMetaData(nextProps.projectId);
+        componentDidUpdate (prevProps) {
+            if (this.props.isFetchingProjectWithId && !prevProps.isFetchingProjectWithId) {
+                this.updateProjectMetaData(this.props.projectId);
             }
         }
         updateProjectMetaData (projectId) {
@@ -80,7 +80,6 @@ const ProjectMetaDataHOC = function (WrappedComponent) {
         return {
             isFetchingProjectWithId: isFetchingProjectWithId(projectState),
             projectId: state.scratchGui.projectId.projectId
-            // token: state.session.session && state.session.session.user && state.session.session.user.token
         };
     };