diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index 558b591..b423ee2 100644
--- a/sdm/libs/hwc2/hwc_display.cpp
+++ b/sdm/libs/hwc2/hwc_display.cpp
@@ -611,8 +611,6 @@
     // Must fall back to client composition
     MarkLayersForClientComposition();
   }
-
-  layer_stack_invalid_ = false;
 }
 
 void HWCDisplay::BuildSolidFillStack() {
@@ -1073,6 +1071,7 @@
   *out_num_requests = UINT32(layer_requests_.size());
   validate_state_ = kNormalValidate;
   validated_ = true;
+  layer_stack_invalid_ = false;
 
   return ((*out_num_types > 0) ? HWC2::Error::HasChanges : HWC2::Error::None);
 }