diff --git a/hal/src/fsfw_hal/linux/spi/ManualCsLockGuard.h b/hal/src/fsfw_hal/linux/spi/ManualCsLockGuard.h
index 99131393..b282bcc0 100644
--- a/hal/src/fsfw_hal/linux/spi/ManualCsLockGuard.h
+++ b/hal/src/fsfw_hal/linux/spi/ManualCsLockGuard.h
@@ -23,12 +23,13 @@ class ManualCsLockWrapper : public HasReturnvaluesIF {
   }
 
   ~ManualCsLockWrapper() {
-    if (lockResult == RETURN_OK) {
-      lock->unlockMutex();
-    }
     if (gpioResult == RETURN_OK) {
       gpioIF->pullHigh(cookie->getChipSelectPin());
     }
+    cookie->setCsLockManual(false);
+    if (lockResult == RETURN_OK) {
+      lock->unlockMutex();
+    }
   }
   ReturnValue_t lockResult;
   ReturnValue_t gpioResult;