diff --git a/core/src/actionscript/org/flowplayer/controller/WaitingState.as b/core/src/actionscript/org/flowplayer/controller/WaitingState.as
index 511b89b..d2f6cd4 100644
--- a/core/src/actionscript/org/flowplayer/controller/WaitingState.as
+++ b/core/src/actionscript/org/flowplayer/controller/WaitingState.as
@@ -48,9 +48,6 @@ import org.flowplayer.model.ClipEventType;
 		}
 
         override internal function stop(closeStreamAndConnection:Boolean = false, silent:Boolean = false):void {
-            if (closeStreamAndConnection) {
-                stop(true);
-            }
         }
 
 		internal override function startBuffering():void {
diff --git a/core/src/actionscript/org/flowplayer/view/AnimationEngine.as b/core/src/actionscript/org/flowplayer/view/AnimationEngine.as
index 78bf7f5..03ca713 100644
--- a/core/src/actionscript/org/flowplayer/view/AnimationEngine.as
+++ b/core/src/actionscript/org/flowplayer/view/AnimationEngine.as
@@ -342,7 +342,7 @@ package org.flowplayer.view {
                 playable.addEventListener(GoEvent.UPDATE, 
                     function(event:GoEvent):void {
                         updateCallback(view);
-                }, false, 0, true);
+                }, false, 0, false);
             }
 
 			playable.start();