diff --git a/clutter/clutter-debug.h b/clutter/clutter-debug.h
index 6d08caf9a..42fe7a8bb 100644
--- a/clutter/clutter-debug.h
+++ b/clutter/clutter-debug.h
@@ -22,7 +22,8 @@ typedef enum {
   CLUTTER_DEBUG_SHADER          = 1 << 12,
   CLUTTER_DEBUG_MULTISTAGE      = 1 << 13,
   CLUTTER_DEBUG_ANIMATION       = 1 << 14,
-  CLUTTER_DEBUG_LAYOUT          = 1 << 15
+  CLUTTER_DEBUG_LAYOUT          = 1 << 15,
+  CLUTTER_DEBUG_NOP_PICKING     = 1 << 16,
 } ClutterDebugFlag;
 
 #ifdef CLUTTER_ENABLE_DEBUG
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 131a4a1a2..5285f4da5 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -94,7 +94,8 @@ static const GDebugKey clutter_debug_keys[] = {
   { "shader", CLUTTER_DEBUG_SHADER },
   { "multistage", CLUTTER_DEBUG_MULTISTAGE },
   { "animation", CLUTTER_DEBUG_ANIMATION },
-  { "layout", CLUTTER_DEBUG_LAYOUT }
+  { "layout", CLUTTER_DEBUG_LAYOUT },
+  { "nop-picking", CLUTTER_DEBUG_NOP_PICKING }
 };
 #endif /* CLUTTER_ENABLE_DEBUG */
 
@@ -375,6 +376,9 @@ _clutter_do_pick (ClutterStage   *stage,
   guint32             id;
   GLboolean           dither_was_on;
 
+  if (clutter_debug_flags & CLUTTER_DEBUG_NOP_PICKING)
+    return CLUTTER_ACTOR (stage);
+
   context = _clutter_context_get_default ();
 
   _clutter_backend_ensure_context (context->backend, stage);