diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 074853bb92..b4d2545e04 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -114,6 +114,9 @@ export default class Dropdown extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
+        if (!nextProps.children || nextProps.children.length === 0) {
+            return;
+        }
         this._reindexChildren(nextProps.children);
         const firstChild = nextProps.children[0];
         this.setState({