diff --git a/README.md b/README.md
index 3992c35d..e45c5555 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ on how to do that, including how to develop and test locally and the versioning
 
 _Note: 1.28.0 and later require Gradle 7_
 
+### 2.6.4
+*Released*: 6 May 2024
+(Earliest compatible LabKey version: 24.5)
+* Put startup properties in correct folder for embedded deployments
+
 ### 2.6.3
 *Released*: 12 April 2024
 (Earliest compatible LabKey version: 24.5)
diff --git a/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy b/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy
index d33d4a2e..1e4711c6 100644
--- a/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy
+++ b/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy
@@ -146,7 +146,9 @@ class TeamCity extends Tomcat
             doLast {
                 String properties = extension.getTeamCityProperty('labkey.startup.properties')
 
-                extension.writeStartupProperties('99_teamcity_startup.properties', properties)
+                if (!properties.isBlank()) {
+                    extension.writeStartupProperties('99_teamcity_startup.properties', properties)
+                }
             }
         }
 
diff --git a/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy b/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy
index e89ce40f..f2e34310 100644
--- a/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy
+++ b/src/main/groovy/org/labkey/gradle/plugin/extension/TeamCityExtension.groovy
@@ -118,7 +118,7 @@ class TeamCityExtension
     File startupPropertiesDir() {
         File startupDir
         if (BuildUtils.useEmbeddedTomcat(project)) {
-            startupDir = new File(new File(ServerDeployExtension.getEmbeddedServerDeployDirectory(project)), 'server/startup')
+            startupDir = new File(new File(ServerDeployExtension.getEmbeddedServerDeployDirectory(project)), 'startup')
         } else {
             startupDir = new File(new File(ServerDeployExtension.getServerDeployDirectory(project)), 'startup')
         }