diff --git a/src/shims/tls.rs b/src/shims/tls.rs
index 54850de82c87..7d4aae367082 100644
--- a/src/shims/tls.rs
+++ b/src/shims/tls.rs
@@ -181,8 +181,8 @@ impl<'tcx> TlsData<'tcx> {
         {
             match data.entry(thread_id) {
                 Entry::Occupied(entry) => {
-                    let data_scalar = entry.remove();
                     if let Some(dtor) = dtor {
+                        let data_scalar = entry.remove();
                         let ret = Some((*dtor, data_scalar, key));
                         return ret;
                     }