diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index 77a08d183..f890e55f8 100644
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -60,6 +60,7 @@ LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings()
 
 LLPanelVoiceDeviceSettings::~LLPanelVoiceDeviceSettings()
 {
+	if (getVisible()) cleanup(); // Singu Note: If we're still visible, we'll need to cleanup
 }
 
 BOOL LLPanelVoiceDeviceSettings::postBuild()