diff --git a/src/engine/strat_engine/backstore/backstore.rs b/src/engine/strat_engine/backstore/backstore.rs
index 029d578a1df..c8d16a9a9d3 100644
--- a/src/engine/strat_engine/backstore/backstore.rs
+++ b/src/engine/strat_engine/backstore/backstore.rs
@@ -563,8 +563,10 @@ impl Backstore {
     pub fn teardown(&mut self, pool_uuid: PoolUuid) -> StratisResult<()> {
         let devs = list_of_backstore_devices(pool_uuid);
         remove_optional_devices(devs)?;
-        self.data_tier.block_mgr.teardown()?;
-        Ok(())
+        if let Some(ref mut cache_tier) = self.cache_tier {
+            cache_tier.block_mgr.teardown()?;
+        }
+        self.data_tier.block_mgr.teardown()
     }
 
     /// Consume the backstore and convert it into a set of BDAs representing