diff --git a/src/components/accordion/Accordion.js b/src/components/accordion/Accordion.js
index c4eb931871..aeefb661ef 100644
--- a/src/components/accordion/Accordion.js
+++ b/src/components/accordion/Accordion.js
@@ -71,9 +71,11 @@ export class Accordion extends Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        this.setState({
-            activeIndex: nextProps.activeIndex
-        });
+        if(nextProps.activeIndex != null) {
+            this.setState({
+                activeIndex: nextProps.activeIndex
+            });
+        }
     }
     
     onTabClick(event, tab, i) {