Reduced packet spam in some cases