diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php
index 525675084db..05e60392401 100644
--- a/auth/shibboleth/index.php
+++ b/auth/shibboleth/index.php
@@ -8,7 +8,7 @@
 
     // Support for WAYFless URLs.
     $target = optional_param('target', '', PARAM_LOCALURL);
-    if (!empty($target)) {
+    if (!empty($target) && empty($SESSION->wantsurl)) {
         $SESSION->wantsurl = $target;
     }