diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index fc4f940e..0843e761 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -150,7 +150,7 @@ class PublicHandler(BaseHandler):
                 entered_password = urllib.parse.unquote(
                     base64.b64decode(data["password"]).decode("utf-8")
                 )
-            except binascii.Error:
+            except (binascii.Error, UnicodeDecodeError):
                 return self.finish_json(
                     403,
                     {