diff --git a/shuttle/src/future/batch_semaphore.rs b/shuttle/src/future/batch_semaphore.rs
index 5be975e2..b3dc6ff9 100644
--- a/shuttle/src/future/batch_semaphore.rs
+++ b/shuttle/src/future/batch_semaphore.rs
@@ -1,9 +1,9 @@
 //! A counting semaphore supporting both async and sync operations.
-use crate::current;
 use crate::runtime::execution::ExecutionState;
 use crate::runtime::task::{clock::VectorClock, TaskId};
 use crate::runtime::thread;
 use crate::sync::{ResourceSignature, ResourceType};
+use crate::{backtrace_enabled, current};
 use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::fmt;
@@ -697,7 +697,7 @@ impl Future for Acquire<'_> {
         }
         self.never_polled = false;
 
-        if self.waiter.has_permits.load(Ordering::SeqCst) {
+        let out = if self.waiter.has_permits.load(Ordering::SeqCst) {
             assert!(!self.waiter.is_queued.load(Ordering::SeqCst));
             self.completed = true;
             trace!("Acquire::poll for waiter {:?} with permits", self.waiter);
@@ -790,7 +790,18 @@ impl Future for Acquire<'_> {
                 // No progress made, future is still pending.
                 Poll::Pending
             }
+        };
+        if matches!(out, Poll::Pending) {
+            // `Backtrace::capture()` is a noop (it returns the constant `disabled()`) if `RUST_BACKTRACE`/`RUST_LIB_BACKTRACE` is not set.
+            ExecutionState::with(|state| {
+                state.current_mut().backtrace = if backtrace_enabled() {
+                    Some(std::backtrace::Backtrace::force_capture())
+                } else {
+                    None
+                }
+            })
         }
+        out
     }
 }
 
diff --git a/shuttle/src/future/mod.rs b/shuttle/src/future/mod.rs
index b504f0f4..d1ffc407 100644
--- a/shuttle/src/future/mod.rs
+++ b/shuttle/src/future/mod.rs
@@ -5,6 +5,7 @@
 //!
 //! [`futures::executor`]: https://docs.rs/futures/0.3.13/futures/executor/index.html
 
+use crate::backtrace_enabled;
 use crate::runtime::execution::ExecutionState;
 use crate::runtime::task::TaskId;
 use crate::runtime::thread;
@@ -171,6 +172,15 @@ impl<T> Future for JoinHandle<T> {
             Poll::Ready(result)
         } else {
             lock.waker = Some(cx.waker().clone());
+
+            ExecutionState::with(|state| {
+                state.current_mut().backtrace = if backtrace_enabled() {
+                    Some(std::backtrace::Backtrace::force_capture())
+                } else {
+                    None
+                }
+            });
+
             Poll::Pending
         }
     }
diff --git a/shuttle/src/runtime/task/mod.rs b/shuttle/src/runtime/task/mod.rs
index c2de013b..1cdc7ef5 100644
--- a/shuttle/src/runtime/task/mod.rs
+++ b/shuttle/src/runtime/task/mod.rs
@@ -505,12 +505,6 @@ impl Task {
     }
 
     pub(crate) fn sleep(&mut self) {
-        self.backtrace = if backtrace_enabled() {
-            Some(Backtrace::force_capture())
-        } else {
-            None
-        };
-
         assert!(self.state != TaskState::Finished);
         self.state = TaskState::Sleeping;
     }