diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 7fa24c5e8..2cb6d9ed0 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -7325,8 +7325,9 @@ clutter_actor_adjust_allocation (ClutterActor    *self,
 
 #ifdef CLUTTER_ENABLE_DEBUG
   /* warn about underallocations */
-  if (floorf (min_width - alloc_width) > 0 ||
-      floorf (min_height - alloc_height) > 0)
+  if (_clutter_diagnostic_enabled () &&
+      (floorf (min_width - alloc_width) > 0 ||
+       floorf (min_height - alloc_height) > 0))
     {
       ClutterActor *parent = clutter_actor_get_parent (self);