Link shortened toggle, automatic link shortener not working with website preview off

The ability to turn the new link shortener off, which hides discordapp media links and similar and only shows the media, would be great. When 'show website preview' is turned off, no link is shown, a message with only an image link will be empty, with the user's name shifted up or down.