diff --git a/src/intel/compiler/brw_opt_register_coalesce.cpp b/src/intel/compiler/brw_opt_register_coalesce.cpp
index 23465df0c50..d00ea0b8c68 100644
--- a/src/intel/compiler/brw_opt_register_coalesce.cpp
+++ b/src/intel/compiler/brw_opt_register_coalesce.cpp
@@ -282,8 +282,8 @@ brw_opt_register_coalesce(brw_shader &s)
       if (inst->opcode == SHADER_OPCODE_LOAD_PAYLOAD) {
          for (int i = 0; i < src_size; i++) {
             dst_reg_offset[i] = inst->dst.offset / REG_SIZE + i;
+            mov[i] = inst;
          }
-         mov[0] = inst;
          channels_remaining -= regs_written(inst);
       } else {
          const int offset = inst->src[0].offset / REG_SIZE;
@@ -297,9 +297,10 @@ brw_opt_register_coalesce(brw_shader &s)
             channels_remaining = -1;
             continue;
          }
-         for (unsigned i = 0; i < MAX2(inst->size_written / REG_SIZE, 1); i++)
+         for (unsigned i = 0; i < MAX2(inst->size_written / REG_SIZE, 1); i++) {
             dst_reg_offset[offset + i] = inst->dst.offset / REG_SIZE + i;
-         mov[offset] = inst;
+            mov[offset + i] = inst;
+         }
          channels_remaining -= regs_written(inst);
       }
 
@@ -318,7 +319,7 @@ brw_opt_register_coalesce(brw_shader &s)
          dst_var[i] = live.var_from_vgrf[dst_reg] + dst_reg_offset[i];
          src_var[i] = live.var_from_vgrf[src_reg] + i;
 
-         if (!can_coalesce_vars(devinfo, live, ips, s.cfg, inst, dst_var[i], src_var[i]) ||
+         if (!can_coalesce_vars(devinfo, live, ips, s.cfg, mov[i], dst_var[i], src_var[i]) ||
              would_violate_eot_restriction(s, s.cfg, dst_reg, src_reg)) {
             can_coalesce = false;
             src_reg = ~0u;
diff --git a/src/intel/compiler/test_opt_register_coalesce.cpp b/src/intel/compiler/test_opt_register_coalesce.cpp
index 840ef10c0ce..aa47c082d26 100644
--- a/src/intel/compiler/test_opt_register_coalesce.cpp
+++ b/src/intel/compiler/test_opt_register_coalesce.cpp
@@ -84,3 +84,28 @@ TEST_F(RegisterCoalesceTest, InterfereButContainEachOther)
 
    EXPECT_SHADERS_MATCH(bld, exp);
 }
+
+TEST_F(RegisterCoalesceTest, ChangingTemporaryCompoundRegisterNotChangesOriginal)
+{
+   brw_builder bld = make_shader();
+
+   brw_reg src = vgrf(bld, BRW_TYPE_F, 2);
+   brw_reg tmp = vgrf(bld, BRW_TYPE_F, 2);
+   brw_reg dst = vgrf(bld, BRW_TYPE_F, 2);
+
+   brw_reg one = brw_imm_f(1.0);
+   brw_reg two = brw_imm_f(2.0);
+
+   bld.MOV(src, one);
+   bld.MOV(offset(src, bld, 1), two);
+
+   bld.MOV(offset(tmp, bld, 1), offset(src, bld, 1));
+
+   bld.MOV(tmp, src);
+   bld.ADD(offset(tmp, bld, 1), offset(tmp, bld, 1), one);
+
+   bld.ADD(dst, src, one);
+   bld.ADD(offset(dst, bld, 1), offset(src, bld, 1), two);
+
+   EXPECT_NO_PROGRESS(brw_opt_register_coalesce, bld);
+}