diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php
index 7d06cea88d..3575310141 100644
--- a/pandora_console/include/load_session.php
+++ b/pandora_console/include/load_session.php
@@ -198,14 +198,11 @@ function pandora_session_gc($max_lifetime=300)
 }
 
 
-// TODO: SAML should work with pandora session handlers.
-if (db_get_value('value', 'tconfig', 'token', 'auth') != 'saml') {
-    $result_handler = session_set_save_handler(
-        'pandora_session_open',
-        'pandora_session_close',
-        'pandora_session_read',
-        'pandora_session_write',
-        'pandora_session_destroy',
-        'pandora_session_gc'
-    );
-}
+$result_handler = session_set_save_handler(
+    'pandora_session_open',
+    'pandora_session_close',
+    'pandora_session_read',
+    'pandora_session_write',
+    'pandora_session_destroy',
+    'pandora_session_gc'
+);