diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index 3435881..f31495c 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -295,6 +295,9 @@
   // TODO(avakulenko): Move this into a notification channel factory and out of
   // this class completely. Also to be added the secondary (poll) notification
   // channel.
+  if (primary_notification_channel_)
+    primary_notification_channel_->Stop();
+
   primary_notification_channel_.reset(
       new XmppChannel{config_->robot_account(),
                       access_token_,
diff --git a/buffet/notification/xmpp_channel.h b/buffet/notification/xmpp_channel.h
index 4afb5df..73daee3 100644
--- a/buffet/notification/xmpp_channel.h
+++ b/buffet/notification/xmpp_channel.h
@@ -95,7 +95,7 @@
   std::string access_token_;
 
   chromeos::StreamPtr raw_socket_;
-  chromeos::StreamPtr tls_stream_;
+  chromeos::StreamPtr tls_stream_;  // Must follow |raw_socket_|.
 
   // Read buffer for incoming message packets.
   std::vector<char> read_socket_data_;