[#955] Prevent noise in the future