diff --git a/hwc3/DrmHwcThree.cpp b/hwc3/DrmHwcThree.cpp
index 4fb33a1..54dba67 100644
--- a/hwc3/DrmHwcThree.cpp
+++ b/hwc3/DrmHwcThree.cpp
@@ -123,6 +123,7 @@
   DEBUG_FUNC();
   if (!connected) {
     composer_resources_->RemoveDisplay(display_id);
+    RemoveDisplay(display_id);
     return;
   }
 
@@ -130,6 +131,7 @@
     /* Cleanup existing display resources */
     CleanDisplayResources(display_id);
     composer_resources_->RemoveDisplay(display_id);
+    RemoveDisplay(display_id);
   }
   composer_resources_->AddPhysicalDisplay(display_id);
 }