diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index cf61609b7..36ab23d7a 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -823,7 +823,7 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
 	// Create a new source (since this can't be associated with an existing source.
 	//llinfos << "Localized: " << audio_uuid << llendl;
 
-	if (mMuted)
+	if (mMuted || gain < FLT_EPSILON*2)
 	{
 		return;
 	}
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c81686330..3f2a9b750 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13755,7 +13755,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>CloudsEnabled</key>
     <map>
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index 9f9df1b45..b53593467 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -248,10 +248,10 @@ void audio_update_wind(bool force_update)
 		// outside the fade-in.
 		static const LLCachedControl<bool> mute_audio("MuteAudio",false);
 		static const LLCachedControl<bool> mute_ambient("MuteAmbient",false);
-		static const LLCachedControl<F32> audio_level_master("AudioLevelMaster",1);
-		static const LLCachedControl<F32> audio_level_ambient("AudioLevelAmbient",1);
-		F32 master_volume  = mute_audio ? 0.f : mute_ambient;
-		F32 ambient_volume = mute_ambient ? 0.f : audio_level_ambient;
+		static const LLCachedControl<F32> audio_level_master("AudioLevelMaster", 1.0f);
+		static const LLCachedControl<F32> audio_level_ambient("AudioLevelAmbient",1.0f);
+		F32 master_volume  = mute_audio ? 0.f : (F32)audio_level_master;
+		F32 ambient_volume = mute_ambient ? 0.f : (F32)audio_level_ambient;
 
 		F32 wind_volume = master_volume * ambient_volume;
 		gAudiop->mMaxWindGain = wind_volume;