diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/lib/Storage/SQLPermanentStorage.php
index d57afd6a5d2c26bc295f3b9f85fd4b1793c61ba4..69a85946ca52827611b074884c0db423c80f638e 100644
--- a/modules/core/lib/Storage/SQLPermanentStorage.php
+++ b/modules/core/lib/Storage/SQLPermanentStorage.php
@@ -18,7 +18,7 @@ class sspmod_core_Storage_SQLPermanentStorage {
 		if (is_null($config))
 			$config = SimpleSAML_Configuration::getInstance();
 		
-		$datadir = $config->getPathValue('datadir');
+		$datadir = $config->getPathValue('datadir', 'data/');
 		
 		if (!is_dir($datadir))
 			throw new Exception('Data directory [' . $datadir. '] does not exist');