diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 948fa649a..df1abea17 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -751,14 +751,15 @@ ms_change_property(ClientPtr client)
 
     client->requestVector[X_ChangeProperty] = saved_change_property;
     ret = saved_change_property(client);
-    if (ret != Success)
-        return ret;
 
     if (restore_property_vector)
         return ret;
 
     client->requestVector[X_ChangeProperty] = ms_change_property;
 
+    if (ret != Success)
+        return ret;
+
     ret = dixLookupWindow(&window, stuff->window, client, DixSetPropAccess);
     if (ret != Success)
         return ret;