diff --git a/libweston/compositor.c b/libweston/compositor.c
index 2df120fa8..9a1509d23 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -7662,7 +7662,7 @@ WL_EXPORT void
 weston_output_set_eotf_mode(struct weston_output *output,
 			    enum weston_eotf_mode eotf_mode)
 {
-	assert(!output->enabled);
+	weston_assert_false(output->compositor, output->enabled);
 
 	output->eotf_mode = eotf_mode;
 }
diff --git a/shared/weston-assert.h b/shared/weston-assert.h
index 5fb0d8cd1..4d5e71705 100644
--- a/shared/weston-assert.h
+++ b/shared/weston-assert.h
@@ -85,6 +85,9 @@ do {										\
 #define weston_assert_true(compositor, a) \
 	weston_assert_(compositor, a, true, bool, "%d", ==)
 
+#define weston_assert_false(compositor, a) \
+	weston_assert_(compositor, a, false, bool, "%d", ==)
+
 #define weston_assert_ptr(compositor, a) \
 	weston_assert_(compositor, a, NULL, const void *, "%p", !=)
 
diff --git a/tests/assert-test.c b/tests/assert-test.c
index fedd682b1..011dacb70 100644
--- a/tests/assert-test.c
+++ b/tests/assert-test.c
@@ -86,6 +86,12 @@ TEST(asserts)
 	ret = weston_assert_true(compositor, true);
 	abort_if_not(ret);
 
+	ret = weston_assert_false(compositor, true);
+	abort_if_not(ret == false);
+
+	ret = weston_assert_false(compositor, false);
+	abort_if_not(ret);
+
 	ret = weston_assert_true(compositor, true && false);
 	abort_if_not(ret == false);