diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
index 8541cb4..58d1845 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
@@ -13,6 +13,7 @@ import java.util.UUID;
 
 import javax.sql.DataSource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
@@ -572,7 +573,7 @@ public class TenantManagementService implements TenantProvider {
 
         log.info("Updating master realm theme: {}", loginTheme);
         RealmRepresentation realmRepresentation = realmService.realm(MASTER_REALM).toRepresentation();
-        realmRepresentation.setLoginTheme(loginTheme);
+        realmRepresentation.setLoginTheme(StringUtils.isEmpty(loginTheme) ? "keycloak" : loginTheme);
         realmService.realm(MASTER_REALM).update(realmRepresentation);
     }