diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index e9a9203a961eaeeef8ec441ac2e4e6d79ebfe175..1ede2be9783cee1ac0d4a4a619397076dc65de4f 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -147,6 +147,8 @@ void LLFirstUse::firstUseNotification(const std::string& control_var, bool enabl
 	{
 		LL_DEBUGS("LLFirstUse") << "Disabling first use notification " << notification_name << LL_ENDL;
 		LLNotifications::instance().cancelByName(notification_name);
+		// redundantly clear settings var here, in case there are no notifications to cancel
+		gWarningSettings.setBOOL(control_var, FALSE);
 	}
 
 }