Some people suggested that this is a bug indeed and maybe entering the Lower City first, then killing Gortash may prevent it.
Has anybody tried it this way?