diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
index 697ebf05..34f6640c 100644
--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@@ -53,11 +53,7 @@ def _normalize_href(base, href):
 
     x = urlparse.urljoin(base, href)
     x = urlparse.urlsplit(x).path
-
-    # We unquote and quote again, but want to make sure we
-    # keep around the "@" character.
-    x = urlparse.unquote(x)
-    x = urlparse.quote(x, "/@")
+    x = urlparse.quote(x, "%/@")
 
     if orig_href == x:
         dav_logger.debug(f"Already normalized: {x!r}")