Fixes #5050
Merge pull request #5054 from mwerezak/species-restricted-spam

Fixes #5050