diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index a3121c000..bb3c8eeb7 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -611,7 +611,11 @@ tgs_make_reply(astgs_request_t r,
     if(ret)
 	goto out;
 
-    ret = copy_Realm(&server_principal->realm, &rep.ticket.realm);
+    if (server->entry.flags.force_canonicalize)
+	ret = copy_Realm(&server->entry.principal->realm, &rep.ticket.realm);
+    else
+	ret = copy_Realm(&server_principal->realm, &rep.ticket.realm);
+
     if (ret)
 	goto out;
     _krb5_principal2principalname(&rep.ticket.sname, server_principal);