Fix OWD-30110
Better conditional statement
No dead code
Merge pull request #301 from telefonicaid/jira/OWD-30110

Fix OWD-30110