diff --git a/src/Discord.Net/DiscordSimpleClient.cs b/src/Discord.Net/DiscordSimpleClient.cs
index 82b60621a..c49fa83dc 100644
--- a/src/Discord.Net/DiscordSimpleClient.cs
+++ b/src/Discord.Net/DiscordSimpleClient.cs
@@ -138,6 +138,8 @@ namespace Discord
 
 				_dataSocket.Host = gateway;
 				_dataSocket.ParentCancelToken = _cancelToken;
+				if (_config.EnableVoice)
+					_voiceSocket.ParentCancelToken = _cancelToken;
 				await _dataSocket.Login(token).ConfigureAwait(false);				
 
 				_runTask = RunTasks();