diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index 8431aa4..0dd2856 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -26,7 +26,7 @@ def validate_manifest(data, validator, error):
     bootloader = data['system']['bootloader']
     virtualization = data['provider']['virtualization']
     encrypted = data['provider'].get('encrypted', False)
-    kms_key_id = data['provider'].get('kms_key_id')
+    kms_key_id = data['provider'].get('kms_key_id', None)
     backing = data['volume']['backing']
     partition_type = data['volume']['partitions']['type']
     enhanced_networking = data['provider']['enhanced_networking'] if 'enhanced_networking' in data['provider'] else None
diff --git a/bootstrapvz/providers/ec2/tasks/ebs.py b/bootstrapvz/providers/ec2/tasks/ebs.py
index b232c47..90239eb 100644
--- a/bootstrapvz/providers/ec2/tasks/ebs.py
+++ b/bootstrapvz/providers/ec2/tasks/ebs.py
@@ -19,7 +19,7 @@ class Create(Task):
         # EBS volumes support encryption. KMS key id is optional and default key
         # is used when it is not defined.
         encrypted = info.manifest.data['provider'].get('encrypted', False)
-        kms_key_id = info.manifest.data['provider'].get('kms_key_id')
+        kms_key_id = info.manifest.data['provider'].get('kms_key_id', None)
 
         info.volume.create(info._ec2['connection'], info._ec2['host']['availabilityZone'], tags=tags, encrypted=encrypted, kms_key_id=kms_key_id)