diff --git a/modules/saml/lib/Auth/Source/SP.php b/modules/saml/lib/Auth/Source/SP.php
index 5ad11ef179bb6126da7a2696614b41ffc1897e61..84f34b5ebb079348c49a06701bf77a3584394b0c 100644
--- a/modules/saml/lib/Auth/Source/SP.php
+++ b/modules/saml/lib/Auth/Source/SP.php
@@ -253,7 +253,7 @@ class SP extends Source
         $requesterID = array();
 
         /* Only check for real info for Scoping element if we are going to send Scoping element */
-        if ($this->disable_scoping != true) {
+        if ($this->disable_scoping != true && $idpMetadata->getBoolean('disable_scoping', false) != true) {
             if (isset($state['saml:IDPList'])) {
                 $IDPList = $state['saml:IDPList'];
             }
@@ -275,7 +275,7 @@ class SP extends Source
                 $requesterID[] = $state['core:SP'];
             }
         } else {
-            $IDPList = [];
+            \SimpleSAML\Logger::debug('Disabling samlp:Scoping for ' . var_export($idpMetadata->getString('entityid'), TRUE));
         }
 
         $ar->setIDPList(