Fix for prod and locked drop down
Fix for prod and locked drop down