diff --git a/templates/aws-stack.yml b/templates/aws-stack.yml
index 54af48050..adbcea5fe 100644
--- a/templates/aws-stack.yml
+++ b/templates/aws-stack.yml
@@ -1130,7 +1130,7 @@ Resources:
                 - Key: Role
                   Value: buildkite-agent
                 - Key: Name
-                  Value: !If [ UseStackNameForInstanceName, !Ref AWS::StackName, !Ref InstanceName ]
+                  Value: !If [ UseStackNameForInstanceName, !Ref "AWS::StackName", !Ref InstanceName ]
                 - Key: BuildkiteAgentRelease
                   Value: !Ref BuildkiteAgentRelease
                 - Key: BuildkiteQueue