diff --git a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java
index 178c021..2aa2020 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java
@@ -37,7 +37,6 @@
 import com.android.tools.r8.ir.code.InvokeStatic;
 import com.android.tools.r8.ir.code.MemberType;
 import com.android.tools.r8.ir.code.NewInstance;
-import com.android.tools.r8.ir.code.Phi;
 import com.android.tools.r8.ir.code.StaticGet;
 import com.android.tools.r8.ir.code.StaticPut;
 import com.android.tools.r8.ir.code.Value;
@@ -130,7 +129,6 @@
       affectedValues.addAll(redundant.outValue().affectedValues());
       redundant.outValue().replaceUsers(value);
       it.removeOrReplaceByDebugLocalRead();
-      value.uniquePhiUsers().forEach(Phi::removeTrivialPhi);
     }
 
     @Override
@@ -443,6 +441,12 @@
       activeStates.recordActiveStateOnBlockExit(end, activeState);
     }
     processInstructionsToRemove();
+    affectedValues.forEach(
+        value -> {
+          if (value.isPhi()) {
+            value.asPhi().removeTrivialPhi();
+          }
+        });
     assumeRemover.removeMarkedInstructions().finish();
     assert code.isConsistentSSA(appView);
   }
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFieldLoadEliminationTrivialPhiTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFieldLoadEliminationTrivialPhiTest.java
new file mode 100644
index 0000000..69da363
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/RedundantFieldLoadEliminationTrivialPhiTest.java
@@ -0,0 +1,63 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.ir.optimize.redundantfieldloadelimination;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class RedundantFieldLoadEliminationTrivialPhiTest extends TestBase {
+
+  private final TestParameters parameters;
+
+  @Parameterized.Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withDefaultRuntimes().withApiLevel(AndroidApiLevel.B).build();
+  }
+
+  public RedundantFieldLoadEliminationTrivialPhiTest(TestParameters parameters) {
+    this.parameters = parameters;
+  }
+
+  @Test
+  public void test() throws Exception {
+    testForR8(parameters.getBackend())
+        .addInnerClasses(RedundantFieldLoadEliminationTrivialPhiTest.class)
+        .addKeepMainRule(TestClass.class)
+        .setMinApi(parameters)
+        .run(parameters.getRuntime(), TestClass.class)
+        .assertSuccessWithOutputLines("1", "1");
+  }
+
+  static class A {
+    int x;
+    int y;
+  }
+
+  static class TestClass {
+
+    public static void main(String[] args) {
+      int unknown = System.currentTimeMillis() > 0 ? 1 : 2;
+      A a = new A();
+      boolean b = true;
+      while (b) {
+        // Ensure we have a phi of a value that will become trivial once fields are optimized.
+        int copy = unknown;
+        a.x = unknown;
+        a.y = copy;
+        unknown = a.x; // Replacing this field read will make the phi trivial.
+        int y = a.y; // This read will be using the phi that becomes trivial.
+        System.out.println(y);
+        System.out.println(copy);
+        b = false;
+      }
+    }
+  }
+}