diff --git a/Echo.php b/Echo.php
index b806d9ffb..6425a4aee 100644
--- a/Echo.php
+++ b/Echo.php
@@ -179,10 +179,6 @@ $wgEchoDefaultNotificationTypes = array( // Welcome events do not use subscripti
 	'all' => array(
 		'notify' => true,
 		'email' => true,
-	),
-	'reverted' => array(
-		'notify' => true,
-		'email' => true,
 	)
 );
 
diff --git a/Hooks.php b/Hooks.php
index 9a76d693c..fd43bd86d 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -157,6 +157,11 @@ class EchoHooks {
 			} elseif ( !$wgEchoDefaultNotificationTypes['all']['email'] ) {
 				continue;
 			}
+			// If we're creating our own preference for email notification on user
+			// talk page edit, remove the existing preference from the User profile tab.
+			if ( $enabledEvent === 'edit-user-talk' ) {
+				unset( $preferences['enotifusertalkpages'] );
+			}
 			$eventMessage = wfMessage( 'echo-pref-email-' . $enabledEvent )->plain();
 			$emailOptions["$eventMessage"] = $enabledEvent;
 		}