diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index e36f9ee..fcf9dd0 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -152,8 +152,8 @@ public class Client implements Closeable {
 		// Process contact searches
 		receiver.registerProcessor(ContactSearchResult.class, eventBus::dispatch);
 
-		receiver.registerProcessor(Contact.class,
-				contacts -> eventBus.dispatch(new ContactOperationEvent(contacts.getContacts().iterator().next(), ElementOperation.ADD)));
+		// Process contact operations
+		receiver.registerProcessor(ContactOperationEvent.class, eventBus::dispatch);
 
 		// Process group size changes
 		receiver.registerProcessor(GroupResizeEvent.class, evt -> { localDB.updateGroup(evt); eventBus.dispatch(evt); });