diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/ChatModule.as b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/ChatModule.as
index c9a5679746..a185adef58 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/ChatModule.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/ChatModule.as
@@ -34,6 +34,7 @@ package org.bigbluebutton.modules.chat
 	import org.bigbluebutton.modules.viewers.ViewersFacade;
 	import org.bigbluebutton.modules.viewers.model.business.Conference;
 	import org.bigbluebutton.common.Constants;
+	import org.bigbluebutton.modules.viewers.model.services.SharedObjectConferenceDelegate;
 	/**
 	 * 
 	 * Class ChatModule acts as view component for Chat Application
@@ -84,12 +85,14 @@ package org.bigbluebutton.modules.chat
 		}
 		
 		override public function logout():void{
-		//	var presentation:PresentationApplication = 
-		//		facade.retrieveMediator(PresentationApplication.NAME) as PresentationApplication;
-				
-		//	presentation.leave();
+		
+			var delegate:SharedObjectConferenceDelegate = 
+				facade.retrieveProxy(SharedObjectConferenceDelegate.NAME) as SharedObjectConferenceDelegate;
+			
+			delegate.leave();
 			
 			facade.removeCore(ChatFacade.NAME);
+		
 		}
 	}
 }
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/ViewersModule.as b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/ViewersModule.as
index ac09c197c3..5e68d49a12 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/ViewersModule.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/ViewersModule.as
@@ -65,6 +65,7 @@ package org.bigbluebutton.modules.viewers
 		}
 		
 		override public function logout():void{
+			
 			var delegate:SharedObjectConferenceDelegate = 
 				facade.retrieveProxy(SharedObjectConferenceDelegate.NAME) as SharedObjectConferenceDelegate;