diff --git a/src/backend/Headless.cpp b/src/backend/Headless.cpp
index fab0017..9c023d5 100644
--- a/src/backend/Headless.cpp
+++ b/src/backend/Headless.cpp
@@ -41,6 +41,7 @@ Aquamarine::CHeadlessOutput::~CHeadlessOutput() {
 bool Aquamarine::CHeadlessOutput::commit() {
     events.commit.emit();
     state->onCommit();
+    needsFrame = false;
     return true;
 }
 
diff --git a/src/backend/Wayland.cpp b/src/backend/Wayland.cpp
index ebadc04..f395147 100644
--- a/src/backend/Wayland.cpp
+++ b/src/backend/Wayland.cpp
@@ -570,8 +570,8 @@ bool Aquamarine::CWaylandOutput::commit() {
     readyForFrameCallback = true;
 
     events.commit.emit();
-
     state->onCommit();
+    needsFrame = false;
 
     return true;
 }
diff --git a/src/backend/drm/DRM.cpp b/src/backend/drm/DRM.cpp
index a64c437..1583a40 100644
--- a/src/backend/drm/DRM.cpp
+++ b/src/backend/drm/DRM.cpp
@@ -1203,6 +1203,7 @@ bool Aquamarine::CDRMOutput::commitState(bool onlyTest) {
     state->onCommit();
 
     lastCommitNoBuffer = !data.mainFB;
+    needsFrame         = false;
 
     return ok;
 }