diff --git a/addons/ondevice-backgrounds/src/BackgroundPanel.js b/addons/ondevice-backgrounds/src/BackgroundPanel.js
index 30800f7ca8e..379f8947028 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;
     }
 
diff --git a/addons/ondevice-backgrounds/src/constants.js b/addons/ondevice-backgrounds/src/constants.js
index 8e876dace84..d28430f5e05 100644
--- a/addons/ondevice-backgrounds/src/constants.js
+++ b/addons/ondevice-backgrounds/src/constants.js
@@ -1,4 +1,4 @@
-export const PARAM_KEY = 'background';
+export const PARAM_KEY = 'backgrounds';
 export const ADDON_ID = 'storybook-addon-background';
 export const PANEL_ID = `${ADDON_ID}/background-panel`;