Try the lateral shoulder raise instead of the upright row.

Safer Alternative to the Upright Row

Instead of doing an upright row, work your shoulders with a front or lateral shoulder raise, lifting weights out to the front or side of the body.