diff --git a/Audio/Chain/ConverterNode.m b/Audio/Chain/ConverterNode.m
index a1cbc6c6b..333a31c3c 100644
--- a/Audio/Chain/ConverterNode.m
+++ b/Audio/Chain/ConverterNode.m
@@ -557,11 +557,6 @@ static float db_to_scale(float db)
 - (void)inputFormatDidChange:(AudioStreamBasicDescription)format
 {
 	DLog(@"FORMAT CHANGED");
-    stopping = YES;
-    while (convertEntered || ACInputEntered || ACFloatEntered)
-    {
-        usleep(500);
-    }
 	[self cleanUp];
 	[self setupWithInputFormat:format outputFormat:outputFormat];
 }
@@ -575,6 +570,11 @@ static float db_to_scale(float db)
 
 - (void)cleanUp
 {
+    stopping = YES;
+    while (convertEntered || ACInputEntered || ACFloatEntered)
+    {
+        usleep(500);
+    }
     rgInfo = nil;
     if (converterFloat)
     {