diff --git a/config/initializers/decidim_ocl_customization.rb b/config/initializers/decidim_ocl_customization.rb
index 1e8ab9f..e56442e 100644
--- a/config/initializers/decidim_ocl_customization.rb
+++ b/config/initializers/decidim_ocl_customization.rb
@@ -34,7 +34,7 @@
 Decidim.config[:devise_custom_scope] = lambda { |org, base = nil|
   base ||= %i[decidim_ocl devise]
 
-  org_scope = (org.tenant_type || 'other').to_sym
+  org_scope = (org.tenant_type.presence || 'other').to_sym
 
   # Ensure that the current tenant is using custom translations for the devise mails
   base + [org_scope] if I18n.t(org_scope, scope: base, default: nil)