diff --git a/common/app/App.jsx b/common/app/App.jsx
index 69e7d8b0822..6099540c7d9 100644
--- a/common/app/App.jsx
+++ b/common/app/App.jsx
@@ -46,14 +46,9 @@ export default contain(
       toast: PropTypes.object
     },
 
-    componentWillReceiveProps({ toast: nextToast }) {
+    componentWillReceiveProps({ toast: nextToast = {} }) {
       const { toast = {} } = this.props;
-      if (
-        toast &&
-        nextToast &&
-        toast.id !== nextToast.id
-      ) {
-
+      if (toast.id !== nextToast.id) {
         this.refs.toaster[nextToast.type || 'success'](
           nextToast.message,
           nextToast.title,