diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 53a4784e4..83d03fad3 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -500,6 +500,10 @@ check_constrained_delegation(krb5_context context,
     krb5_error_code ret;
     int i;
 
+    /* if client delegates to itself, that ok */
+    if (krb5_principal_compare(context, client->principal, server) == TRUE)
+	return 0;
+
     if (clientdb->hdb_check_constrained_delegation) {
 	ret = clientdb->hdb_check_constrained_delegation(context, clientdb, client, server);
 	if (ret == 0)