diff --git a/src/components/inputs/AutocompleteInput.jsx b/src/components/inputs/AutocompleteInput.jsx
index 7546873b..36edb4b4 100644
--- a/src/components/inputs/AutocompleteInput.jsx
+++ b/src/components/inputs/AutocompleteInput.jsx
@@ -6,10 +6,15 @@ import { margins, fontSizes } from '../../config/scales'
 
 class AutocompleteInput extends React.Component {
   static propTypes = {
-    value: React.PropTypes.string.isRequired,
-    options: React.PropTypes.array.isRequired,
+    value: React.PropTypes.string,
+    options: React.PropTypes.array,
     style: React.PropTypes.object,
-    onChange: React.PropTypes.func.isRequired,
+    onChange: React.PropTypes.func,
+  }
+
+  static defaultProps = {
+    onChange: () => {},
+    options: [],
   }
 
   render() {
diff --git a/src/components/layers/LayerSourceBlock.jsx b/src/components/layers/LayerSourceBlock.jsx
index 4a69e6b8..6a85160f 100644
--- a/src/components/layers/LayerSourceBlock.jsx
+++ b/src/components/layers/LayerSourceBlock.jsx
@@ -7,9 +7,14 @@ import AutocompleteInput from '../inputs/AutocompleteInput'
 
 class LayerSourceBlock extends React.Component {
   static propTypes = {
-    value: React.PropTypes.string.isRequired,
-    onChange: React.PropTypes.func.isRequired,
-    sourceIds: React.PropTypes.array.isRequired,
+    value: React.PropTypes.string,
+    onChange: React.PropTypes.func,
+    sourceIds: React.PropTypes.array,
+  }
+
+  static defaultProps = {
+    onChange: () => {},
+    sourceIds: [],
   }
 
   render() {
diff --git a/src/components/layers/LayerSourceLayerBlock.jsx b/src/components/layers/LayerSourceLayerBlock.jsx
index a9281ac5..b7f9fd43 100644
--- a/src/components/layers/LayerSourceLayerBlock.jsx
+++ b/src/components/layers/LayerSourceLayerBlock.jsx
@@ -7,9 +7,14 @@ import AutocompleteInput from '../inputs/AutocompleteInput'
 
 class LayerSourceLayer extends React.Component {
   static propTypes = {
-    value: React.PropTypes.string.isRequired,
-    onChange: React.PropTypes.func.isRequired,
-    sourceLayerIds: React.PropTypes.array.isRequired,
+    value: React.PropTypes.string,
+    onChange: React.PropTypes.func,
+    sourceLayerIds: React.PropTypes.array,
+  }
+
+  static defaultProps = {
+    onChange: () => {},
+    sourceLayerIds: [],
   }
 
   render() {