diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index d34931c9914..4d65fbf9841 100755
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@@ -834,7 +834,8 @@ def create_instances(module, ec2, override_count=None):
             if ebs_optimized:
               params['ebs_optimized'] = ebs_optimized
               
-            if tenancy:
+            # 'tenancy' always has a default value, but it is not a valid parameter for spot instance resquest
+            if not spot_price:
               params['tenancy'] = tenancy
 
             if boto_supports_profile_name_arg(ec2):