diff --git a/dix/devices.c b/dix/devices.c
index 3388dac8d..065b20237 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1422,7 +1422,7 @@ ProcSetModifierMapping(ClientPtr client)
     rc = change_modmap(client, PickKeyboard(client), (KeyCode *)&stuff[1],
                        stuff->numKeyPerModifier);
     if (rc == MappingFailed || rc == -1)
-        rc = BadValue;
+        return BadValue;
     if (rc != Success && rc != MappingSuccess && rc != MappingFailed &&
         rc != MappingBusy)
 	return rc;