diff --git a/java/google/registry/flows/contact/ContactUpdateFlow.java b/java/google/registry/flows/contact/ContactUpdateFlow.java
index 5d37d77b0..de0c854e4 100644
--- a/java/google/registry/flows/contact/ContactUpdateFlow.java
+++ b/java/google/registry/flows/contact/ContactUpdateFlow.java
@@ -29,6 +29,7 @@ import javax.inject.Inject;
  * An EPP flow that updates a contact resource.
  *
  * @error {@link google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException}
+ * @error {@link google.registry.flows.ResourceUpdateFlow.AddRemoveSameValueEppException}
  * @error {@link google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException}
  * @error {@link google.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException}
  * @error {@link google.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException}
diff --git a/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java b/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java
index 764a2e005..b8f5752b0 100644
--- a/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java
+++ b/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java
@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.flows.ResourceFlowTestCase;
 import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException;
 import google.registry.flows.ResourceMutateFlow.ResourceToMutateDoesNotExistException;
+import google.registry.flows.ResourceUpdateFlow.AddRemoveSameValueEppException;
 import google.registry.flows.ResourceUpdateFlow.ResourceHasClientUpdateProhibitedException;
 import google.registry.flows.ResourceUpdateFlow.StatusNotClientSettableException;
 import google.registry.flows.SingleResourceFlow.ResourceStatusProhibitsOperationException;
@@ -258,4 +259,12 @@ public class ContactUpdateFlowTest
     persistActiveContact(getUniqueIdFromCommand());
     runFlow();
   }
+
+  @Test
+  public void testFailure_addRemoveSameValue() throws Exception {
+    thrown.expect(AddRemoveSameValueEppException.class);
+    setEppInput("contact_update_add_remove_same.xml");
+    persistActiveContact(getUniqueIdFromCommand());
+    runFlow();
+  }
 }
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml b/javatests/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml
new file mode 100644
index 000000000..66087fa96
--- /dev/null
+++ b/javatests/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml
@@ -0,0 +1,39 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <contact:update
+       xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
+        <contact:id>sh8013</contact:id>
+        <contact:add>
+          <contact:status s="clientDeleteProhibited"/>
+        </contact:add>
+        <contact:rem>
+          <contact:status s="clientDeleteProhibited"/>
+        </contact:rem>
+        <contact:chg>
+          <contact:postalInfo type="int">
+            <contact:org/>
+            <contact:addr>
+              <contact:street>124 Example Dr.</contact:street>
+              <contact:street>Suite 200</contact:street>
+              <contact:city>Dulles</contact:city>
+              <contact:sp>VA</contact:sp>
+              <contact:pc>20166-6503</contact:pc>
+              <contact:cc>US</contact:cc>
+            </contact:addr>
+          </contact:postalInfo>
+          <contact:voice>+1.7034444444</contact:voice>
+          <contact:fax/>
+          <contact:authInfo>
+            <contact:pw>2fooBAR</contact:pw>
+          </contact:authInfo>
+          <contact:disclose flag="1">
+            <contact:voice/>
+            <contact:email/>
+          </contact:disclose>
+        </contact:chg>
+      </contact:update>
+    </update>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>