diff --git a/src/Audio/AudioDevice.cs b/src/Audio/AudioDevice.cs
index 35036760..30763a8f 100644
--- a/src/Audio/AudioDevice.cs
+++ b/src/Audio/AudioDevice.cs
@@ -278,10 +278,11 @@ namespace MoonWorks.Audio
 			if (!IsDisposed)
 			{
 				Running = false;
-				Thread.Join();
 
 				if (disposing)
 				{
+					Thread.Join();
+
 					// stop all source voices
 					foreach (var resource in resources)
 					{