diff --git a/app/components/ErrorBoundary/ErrorBoundary.js b/app/components/ErrorBoundary/ErrorBoundary.js
index 162e164f..f34df8fa 100644
--- a/app/components/ErrorBoundary/ErrorBoundary.js
+++ b/app/components/ErrorBoundary/ErrorBoundary.js
@@ -2,12 +2,10 @@
 import React, { Component } from 'react';
 import { observer } from 'mobx-react';
 import { observable } from 'mobx';
-import type { Location } from 'react-router-dom';
 import CenteredContent from 'components/CenteredContent';
 import PageTitle from 'components/PageTitle';
 
 type Props = {
-  location?: Location,
   children?: ?React.Element<any>,
 };
 
@@ -16,15 +14,6 @@ class ErrorBoundary extends Component {
   props: Props;
   @observable error: boolean = false;
 
-  componentWillReceiveProps(nextProps: Object) {
-    if (
-      this.props.location &&
-      nextProps.location &&
-      this.props.location.pathname !== nextProps.location.pathname
-    )
-      this.error = false;
-  }
-
   componentDidCatch(error: Error, info: Object) {
     this.error = true;
 
diff --git a/app/scenes/Document/Document.js b/app/scenes/Document/Document.js
index af22e553..084d96f6 100644
--- a/app/scenes/Document/Document.js
+++ b/app/scenes/Document/Document.js
@@ -217,7 +217,7 @@ class DocumentScene extends Component {
 
     return (
       <Container column auto>
-        <ErrorBoundary location={this.props.location}>
+        <ErrorBoundary key={this.props.location.pathname}>
           {isMoving && document && <DocumentMove document={document} />}
           {titleText && <PageTitle title={titleText} />}
           {(this.isLoading || this.isSaving) && <LoadingIndicator />}