diff --git a/libhwcomposer/hwc_uevents.cpp b/libhwcomposer/hwc_uevents.cpp
index 7061991..c535c5e 100644
--- a/libhwcomposer/hwc_uevents.cpp
+++ b/libhwcomposer/hwc_uevents.cpp
@@ -129,6 +129,8 @@
             clear(ctx, dpy);
             ctx->dpyAttr[dpy].connected = false;
             ctx->dpyAttr[dpy].isActive = false;
+            /* If disconnect comes before any composition cycle */
+            ctx->dpyAttr[dpy].isConfiguring = false;
 
             ctx->mExtDisplay->teardown();