diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
index 45b1ae6f539f44e08ea0c6e32ee6d120a1e9ad7f..0620d600a0aadbd80f98df3caa54dbac2cbbdd95 100644
--- a/lib/SimpleSAML/Module.php
+++ b/lib/SimpleSAML/Module.php
@@ -41,7 +41,7 @@ class SimpleSAML_Module {
 			return FALSE;
 		}
 
-		$globalConfig = SimpleSAML_Configuration::getInstance();
+		$globalConfig = SimpleSAML_Configuration::getOptionalConfig();
 		$moduleEnable = $globalConfig->getArray('module.enable', array());
 
 		if(isset($moduleEnable[$module])) {