diff --git a/addons/ondevice-backgrounds/src/BackgroundPanel.js b/addons/ondevice-backgrounds/src/BackgroundPanel.js
index 30800f7ca8e0..379f8947028a 100644
--- a/addons/ondevice-backgrounds/src/BackgroundPanel.js
+++ b/addons/ondevice-backgrounds/src/BackgroundPanel.js
@@ -56,7 +56,7 @@ export default class BackgroundPanel extends Component {
   render() {
     const { active, api } = this.props;
 
-    if (!active) {
+    if (!active || !this.state) {
       return null;
     }