diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 5366943..9b4d76f 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -319,7 +319,7 @@
 
 ComposerClient::~ComposerClient() {
   DEBUG_FUNC();
-  {
+  if (hwc_) {
     const std::unique_lock lock(hwc_->GetResMan().GetMainLock());
     hwc_->DeinitDisplays();
     hwc_.reset();