diff --git a/htdocs/always.php b/htdocs/always.php
index 2a31a08d..a8c872b0 100644
--- a/htdocs/always.php
+++ b/htdocs/always.php
@@ -380,6 +380,7 @@ function DeconstructURL( $url, $force_script = false ) {
   global $c;
 
   $dav_name = rawurldecode($url);
+  $dav_name = trim($dav_name);
 
   /** Allow a path like .../username/calendar.ics to translate into the calendar URL */
   if ( preg_match( '#^(/[^/]+/[^/]+).ics$#', $dav_name, $matches ) ) {
diff --git a/inc/always.php.in b/inc/always.php.in
index 947878cb..b30fe6bd 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -380,6 +380,7 @@ function DeconstructURL( $url, $force_script = false ) {
   global $c;
 
   $dav_name = rawurldecode($url);
+  $dav_name = trim($dav_name);
 
   /** Allow a path like .../username/calendar.ics to translate into the calendar URL */
   if ( preg_match( '#^(/[^/]+/[^/]+).ics$#', $dav_name, $matches ) ) {