diff --git a/CHANGES.txt b/CHANGES.txt
index c147eca9fc..80bd148b13 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -334,6 +334,7 @@
 
 
 3.11.4
+ * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
  * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870)
 Merged from 3.0:
  * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
diff --git a/bin/stop-server.bat b/bin/stop-server.bat
index 66a55fd2cb..acd88d0fdb 100644
--- a/bin/stop-server.bat
+++ b/bin/stop-server.bat
@@ -38,7 +38,7 @@ FOR /F "tokens=2 delims= " %%A IN ('TASKLIST /FI ^"WINDOWTITLE eq %rand%^" /NH')
 
 REM Start with /B -> the control+c event we generate in stop-server.ps1 percolates
 REM up and hits this external batch file if we call powershell directly.
-start /B powershell /file "%CASSANDRA_HOME%/bin/stop-server.ps1" -batchpid %PID% %*
+start /WAIT /B powershell /file "%CASSANDRA_HOME%/bin/stop-server.ps1" -batchpid %PID% %*
 goto finally
 
 REM -----------------------------------------------------------------------------