diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php
index bd4eddb9a4a..051ac4f5c17 100644
--- a/auth/shibboleth/index.php
+++ b/auth/shibboleth/index.php
@@ -6,6 +6,9 @@
 
     $PAGE->set_url('/auth/shibboleth/index.php');
 
+    // Support for WAYFless URLs.
+    $SESSION->wantsurl = optional_param('target', $SESSION->wantsurl, PARAM_LOCALURL);
+
     if (isloggedin() && !isguestuser()) {      // Nothing to do
         if (isset($SESSION->wantsurl) and (strpos($SESSION->wantsurl, $CFG->wwwroot) === 0)) {
             $urltogo = $SESSION->wantsurl;    /// Because it's an address in this site