diff --git a/modules/core/lib/Auth/Process/AttributeLimit.php b/modules/core/lib/Auth/Process/AttributeLimit.php
index b5157276eae9e0398097dae0d04bef5f8df5b0dc..b8c7767de749c680275fe91ca2c4cf2a5fbe793e 100644
--- a/modules/core/lib/Auth/Process/AttributeLimit.php
+++ b/modules/core/lib/Auth/Process/AttributeLimit.php
@@ -58,6 +58,13 @@ class sspmod_core_Auth_Process_AttributeLimit extends SimpleSAML_Auth_Processing
 				}
 			} elseif (array_key_exists('attributes', $request['Destination'])) {
 				$this->allowedAttributes = $request['Destination']['attributes'];
+			} else {
+				/*
+				 * When no list of attributes is provided in filter config, and no
+				 * attributes is listed in the destionation metadata, no filtering
+				 * will be performed. Default behaviour is letting all attributes through
+				 */
+				return;
 			}
 		}