Merge pull request 'bugfix for #36 #50' (#59) from nullptr-0/web:pr into master

Reviewed-on: https://git.unlock-music.dev/um/web/pulls/59


Reviewed-by: jixunmoe <jixunmoe@noreply.unlock-music.dev>