diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 17d59f86bbf3452d9590584e36f825db0e1e126b..c8d50ceb1092284d256097553c7d57a33c1dca09 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -128,7 +128,7 @@ void LLCallFloater::refreshPartisipantList()
 	delete mPaticipants;
 	mAvatarList->clear();
 
-	bool is_local_chat_session = LLLocalSpeakerMgr::getInstance() == mSpeakerManager;
-	mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, is_local_chat_session);
+	bool do_not_use_context_menu_in_local_chat = LLLocalSpeakerMgr::getInstance() != mSpeakerManager;
+	mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, do_not_use_context_menu_in_local_chat);
 }
 //EOF
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index 7cf5302e40ded71393d20e97090f1f2730a2ab5b..68dc1b511f64f76e753276be1dd2c9100729ce0d 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -74,6 +74,10 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* av
 		mParticipantListMenu = new LLParticipantListMenu(*this);
 		mAvatarList->setContextMenu(mParticipantListMenu);
 	}
+	else
+	{
+		mAvatarList->setContextMenu(NULL);
+	}
 
 	//Lets fill avatarList with existing speakers
 	LLAvatarList::uuid_vector_t& group_members = mAvatarList->getIDs();