diff --git a/backends/hwcomposer/hwcomposer_backend.cpp b/backends/hwcomposer/hwcomposer_backend.cpp
index 8d5b706ac3..0d30324ac5 100644
--- a/backends/hwcomposer/hwcomposer_backend.cpp
+++ b/backends/hwcomposer/hwcomposer_backend.cpp
@@ -169,11 +169,9 @@ void HwcomposerBackend::toggleBlankOutput()
          enableVSync(false);
     }
     // enable/disable compositor repainting when blanked
+    setOutputsEnabled(!m_outputBlank);
     if (Compositor *compositor = Compositor::self()) {
-        if (m_outputBlank) {
-            compositor->aboutToSwapBuffers();
-        } else {
-            compositor->bufferSwapComplete();
+        if (!m_outputBlank) {
             compositor->addRepaintFull();
         }
     }