diff --git a/modules/consent/lib/Auth/Process/Consent.php b/modules/consent/lib/Auth/Process/Consent.php
index 7763565fcf64f516c0cb0be28d9f8dc06fc0ab3d..ae2be3fb6b97f441da100255a3667545c153bf80 100644
--- a/modules/consent/lib/Auth/Process/Consent.php
+++ b/modules/consent/lib/Auth/Process/Consent.php
@@ -159,11 +159,16 @@ class sspmod_consent_Auth_Process_Consent extends SimpleSAML_Auth_ProcessingFilt
 		}
 		
 		if ($this->store !== NULL) {
+            // Do not use consent if disabled on source entity 
+            if(isset($state['Source']['consent.disable']) && in_array($state['Destination']['entityid'], $state['Source']['consent.disable'])) {
+                SimpleSAML_Logger::debug('Consent - Consent disabled for entity ' . $state['Destination']['entityid']);
+                return;
+            }
 
 			$source = $state['Source']['metadata-set'] . '|' . $state['Source']['entityid'];
 			$destination = $state['Destination']['metadata-set'] . '|' . $state['Destination']['entityid'];
-
-			SimpleSAML_Logger::debug('Consent - userid : ' . $state['UserID']);
+			
+            SimpleSAML_Logger::debug('Consent - userid : ' . $state['UserID']);
 			SimpleSAML_Logger::debug('Consent - source : ' . $source);
 			SimpleSAML_Logger::debug('Consent - destination : ' . $destination);
 	
@@ -246,4 +251,4 @@ class sspmod_consent_Auth_Process_Consent extends SimpleSAML_Auth_ProcessingFilt
 
 }
 
-?>
\ No newline at end of file
+?>