From bc166f19b7754fe07843177487fb48af83f4a3d7 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 16 May 2016 16:04:06 +0100
Subject: [PATCH] Fix NPE when loading the Settings page which infini-spinnered

---
 src/components/views/settings/Notifications.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 4364da8b0d..a9ff9c0e5a 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -74,6 +74,12 @@ module.exports = React.createClass({
         threepids: React.PropTypes.array.isRequired,
     },
 
+    getDefaultProps: function() {
+        return {
+            threepids: []
+        };
+    },
+
     getInitialState: function() {
         return {
             phase: this.phases.LOADING,