fix: added currentTenant protection

Mike Hoang requested to merge mike/hide_currentTenant into master
Edited by Mike Hoang

Merge request reports