diff --git a/MessageBar.js b/MessageBar.js
index 129f352..296fb00 100644
--- a/MessageBar.js
+++ b/MessageBar.js
@@ -35,7 +35,9 @@ class MessageBar extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    this.setNewState(nextProps);
+    if (nextProps && Object.keys(nextProps).length > 0) {
+      this.setNewState(nextProps);
+    }
   }
 
   setNewState(state) {