diff --git a/CHANGELOG.md b/CHANGELOG.md
index db09b75b..3e0548de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,8 +28,10 @@ Dropping a requirement of a major version of a dependency is a new contract.
 
 ### Fixed
 - Wait until Docker is started before pulling images. Fix [JPERF-1104].
+- Extend `AsyncProfiler` `stop` timeout. Fix [JPERF-1081].
 
 [JPERF-1104]: https://ecosystem.atlassian.net/browse/JPERF-1104
+[JPERF-1081]: https://ecosystem.atlassian.net/browse/JPERF-1081
 
 ## [4.24.1] - 2023-05-10
 [4.24.1]: https://github.com/atlassian/infrastructure/compare/release-4.24.0...release-4.24.1
diff --git a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/profiler/AsyncProfiler.kt b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/profiler/AsyncProfiler.kt
index 17f21e24..82f2764d 100644
--- a/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/profiler/AsyncProfiler.kt
+++ b/src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/profiler/AsyncProfiler.kt
@@ -4,6 +4,7 @@ import com.atlassian.performance.tools.infrastructure.api.process.RemoteMonitori
 import com.atlassian.performance.tools.jvmtasks.api.IdempotentAction
 import com.atlassian.performance.tools.jvmtasks.api.StaticBackoff
 import com.atlassian.performance.tools.ssh.api.SshConnection
+import java.time.Duration
 import java.time.Duration.ofSeconds
 
 /**
@@ -39,7 +40,7 @@ class AsyncProfiler : Profiler {
         private val flameGraphFile = "flamegraph.svg"
 
         override fun stop(ssh: SshConnection) {
-            ssh.execute("$script stop $pid -o flamegraph > $flameGraphFile")
+            ssh.execute("$script stop $pid -o flamegraph > $flameGraphFile", timeout = ofSeconds(50))
         }
 
         override fun getResultPath(): String {