teiiddes-1647: Corrected default ns logic