But when he did his set on June 15, he thought enough time had passed to reintroduce white supremacist-related material into his act.
After finishing his set he was confronted by a man, possibly in his late 20s.
The man grabbed him by the back of the head and tried to push him in the direction of the local RSA, saying he should tell the joke there.
The man was then dragged out of the premises by his girlfriend and pushed out of the pub by staff when he tried to re-enter.
"We ascertained he was offended about something about World War 2, even though he kept saying World War 1," Kingsley-Holmes said.
The incident had not put him off doing a similar routine in the future.
"It might be a while longer till I do a joke like that in the heart of Christchurch but I am at peace with what the joke is, I'm not bothered about him being offended by it."
- Star.kiwi