diff --git a/app/components/ErrorBoundary/ErrorBoundary.js b/app/components/ErrorBoundary/ErrorBoundary.js
index 02bbc5188..60a380364 100644
--- a/app/components/ErrorBoundary/ErrorBoundary.js
+++ b/app/components/ErrorBoundary/ErrorBoundary.js
@@ -2,16 +2,23 @@
 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,
+};
+
 @observer
 class ErrorBoundary extends Component {
+  props: Props;
   @observable error: boolean = false;
 
   componentWillReceiveProps(nextProps: Object) {
     if (
-      (this.props.location || nextProps.location) &&
+      this.props.location &&
+      nextProps.location &&
       this.props.location.pathname !== nextProps.location.pathname
     )
       this.error = false;