diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index f28c3596b9..8ef8574377 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -3178,7 +3178,7 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
     for (i = 0; i < drmmode_output->num_props; i++) {
         drmmode_prop_ptr p = &drmmode_output->props[i];
 
-        if (p->atoms[0] != property)
+        if (p->atoms && p->atoms[0] != property)
             continue;
 
         if (p->mode_prop->flags & DRM_MODE_PROP_RANGE) {