diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index cbf8eb07258c4abc1ed824004bb2d2e6cf76901a..268d9dd4079cf5a28daa5656ba127ca1c2784d59 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -249,6 +249,12 @@ LLUICtrl::~LLUICtrl()
 		gFocusMgr.removeTopCtrlWithoutCallback( this );
 	}
 
+	mControlConnection.disconnect();
+	mEnabledControlConnection.disconnect();
+	mDisabledControlConnection.disconnect();
+	mMakeVisibleControlConnection.disconnect();
+	mMakeInvisibleControlConnection.disconnect();
+
 	delete mCommitSignal;
 	delete mValidateSignal;
 	delete mMouseEnterSignal;
diff --git a/indra/newview/llfloaterspellchecksettings.cpp b/indra/newview/llfloaterspellchecksettings.cpp
index 32eb70cd39eacd6f99df86640c3f619b7f14209a..0fa1d4b0a4bb20475454ec2c209c5e2a10104821 100644
--- a/indra/newview/llfloaterspellchecksettings.cpp
+++ b/indra/newview/llfloaterspellchecksettings.cpp
@@ -63,7 +63,7 @@ void LLFloaterSpellCheckerSettings::draw()
 
 BOOL LLFloaterSpellCheckerSettings::postBuild(void)
 {
-	gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&LLFloaterSpellCheckerSettings::refreshDictionaries, this, false));
+	mSpellcheckCtrlConnection = gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&LLFloaterSpellCheckerSettings::refreshDictionaries, this, false));
 	LLSpellChecker::setSettingsChangeCallback(boost::bind(&LLFloaterSpellCheckerSettings::onSpellCheckSettingsChange, this));
 	getChild<LLUICtrl>("spellcheck_remove_btn")->setCommitCallback(boost::bind(&LLFloaterSpellCheckerSettings::onBtnRemove, this));
 	getChild<LLUICtrl>("spellcheck_import_btn")->setCommitCallback(boost::bind(&LLFloaterSpellCheckerSettings::onBtnImport, this));
@@ -101,6 +101,8 @@ void LLFloaterSpellCheckerSettings::onBtnMove(const std::string& from, const std
 
 void LLFloaterSpellCheckerSettings::onClose(bool app_quitting)
 {
+	mSpellcheckCtrlConnection.disconnect();
+
 	if (app_quitting)
 	{
 		// don't save anything
diff --git a/indra/newview/llfloaterspellchecksettings.h b/indra/newview/llfloaterspellchecksettings.h
index 200cbb203de3866695fa1d2bae018740a9c1fb7b..e667dadf5188cff0e3d45a9cd67135a522a16a3b 100644
--- a/indra/newview/llfloaterspellchecksettings.h
+++ b/indra/newview/llfloaterspellchecksettings.h
@@ -45,6 +45,9 @@ class LLFloaterSpellCheckerSettings final : public LLFloater
 	void onBtnRemove();
 	void onSpellCheckSettingsChange();
 	void refreshDictionaries(bool from_settings);
+
+private:
+	boost::signals2::connection mSpellcheckCtrlConnection;
 };
 
 class LLFloaterSpellCheckerImport final : public LLFloater
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index bed79022cd74f035198b6e5df026615352098e76..bde67d6e03887f2d2d57eb73953cb230102ceeb0 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -385,6 +385,10 @@ LLVivoxVoiceClient::~LLVivoxVoiceClient()
 	{
 		mAvatarNameCacheConnection.disconnect();
 	}
+	mVivoxVadAutoCon.disconnect();
+    mVivoxVadAHangoverCon.disconnect();
+    mVivoxVadNoiseCon.disconnect();
+    mVivoxVadSensitivityCon.disconnect();
     sShuttingDown = true;
 }
 
@@ -854,10 +858,10 @@ void LLVivoxVoiceClient::voiceControlStateMachine(S32 &coro_state)
                 setupVADParams(vad_auto, vad_hangover, vad_noise_floor, vad_sensitivity);
 
                 // watch for changes to the VAD settings via Debug Settings UI and act on them accordingly
-                gSavedSettings.getControl("VivoxVadAuto")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
-                gSavedSettings.getControl("VivoxVadHangover")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
-                gSavedSettings.getControl("VivoxVadNoiseFloor")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
-                gSavedSettings.getControl("VivoxVadSensitivity")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+                mVivoxVadAutoCon = gSavedSettings.getControl("VivoxVadAuto")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+                mVivoxVadAHangoverCon = gSavedSettings.getControl("VivoxVadHangover")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+                mVivoxVadNoiseCon = gSavedSettings.getControl("VivoxVadNoiseFloor")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
+                mVivoxVadSensitivityCon = gSavedSettings.getControl("VivoxVadSensitivity")->getSignal()->connect(boost::bind(&LLVivoxVoiceClient::onVADSettingsChange, this));
 
                 if (mTuningMode)
                 {
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index eb99ae66b9c7745e6b69f50db40adf89541b439d..7b4c71bedae6a46924a6aa5c7b0e84ab49fcaec9 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -604,7 +604,11 @@ class LLVivoxVoiceClient final : public LLSingleton<LLVivoxVoiceClient>,
 	void avatarNameResolved(const LLUUID &id, const std::string &name);
     static void predAvatarNameResolution(const LLVivoxVoiceClient::sessionStatePtr_t &session, LLUUID id, std::string name);
 
-	boost::signals2::connection mAvatarNameCacheConnection;
+	boost::signals2::scoped_connection mAvatarNameCacheConnection;
+    boost::signals2::scoped_connection mVivoxVadAutoCon;
+    boost::signals2::scoped_connection mVivoxVadAHangoverCon;
+    boost::signals2::scoped_connection mVivoxVadNoiseCon;
+    boost::signals2::scoped_connection mVivoxVadSensitivityCon;
 
 	/////////////////////////////
 	// Voice fonts