diff --git a/src/lib/ecore_drm2/ecore_drm2_plane.c b/src/lib/ecore_drm2/ecore_drm2_plane.c
index 155c932bf5..9ebc1d96ff 100644
--- a/src/lib/ecore_drm2/ecore_drm2_plane.c
+++ b/src/lib/ecore_drm2/ecore_drm2_plane.c
@@ -109,6 +109,14 @@ out:
    DBG("FB %d assigned to Plane %d", fb->id, pstate->obj_id);
    output->planes = eina_list_append(output->planes, plane);
 
+   if (!_fb_atomic_flip_test(output))
+     {
+        output->planes = eina_list_remove(output->planes, plane);
+        plane->state->in_use = EINA_FALSE;
+        free(plane);
+
+        return NULL;
+     }
    return plane;
 }