diff --git a/samcli/lib/bootstrap/bootstrap.py b/samcli/lib/bootstrap/bootstrap.py
index 81c30c7748..eaed58d630 100644
--- a/samcli/lib/bootstrap/bootstrap.py
+++ b/samcli/lib/bootstrap/bootstrap.py
@@ -73,6 +73,9 @@ def _get_stack_template():
                       - "/*"
                 Principal:
                   Service: serverlessrepo.amazonaws.com
+                Condition:
+                  StringEquals:
+                    aws:SourceAccount: !Ref AWS::AccountId
 
     Outputs:
       SourceBucket: