diff --git a/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs b/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs
index 194fdbda7..b3777801c 100644
--- a/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs
+++ b/src/Discord.Net/WebSockets/Voice/VoiceWebSocket.cs
@@ -167,8 +167,10 @@ namespace Discord.WebSockets.Voice
 		protected override Task Cleanup()
 		{
 #if USE_THREAD
-			_sendThread.Join();
-			_receiveThread.Join();
+			if (_sendThread != null)
+				_sendThread.Join();
+			if (_receiveThread != null)	
+				_receiveThread.Join();
 			_sendThread = null;
 			_receiveThread = null;
 #endif