diff --git a/templates/lexbot.yaml b/templates/lexbot.yaml
index 2e651f29..0feab58a 100644
--- a/templates/lexbot.yaml
+++ b/templates/lexbot.yaml
@@ -460,6 +460,7 @@ Resources:
 
   QBusinessBotPermission:
     Type: AWS::Lambda::Permission
+    Condition: EnableQBusiness
     Properties:
       FunctionName: !Ref QnaBusinessLambdaFulfillmentFunction
       Action: 'lambda:InvokeFunction'
diff --git a/templates/master.yaml b/templates/master.yaml
index 4f576e82..c6172dd8 100644
--- a/templates/master.yaml
+++ b/templates/master.yaml
@@ -582,6 +582,7 @@ Parameters:
 
     IDCApplicationARN:
         Type: String
+        Default: ''
         Description: >
             ARN of the Identity Center customer managed application created for QBusiness. This will need to be configured
             manually after initial UI deployment. The value from manual creation will need to be supplied here and the template updated.