diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 69b437ab650..a07b1152393 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -82,15 +82,13 @@ if (!function_exists('utf8_decode')) {
 function getMultidirOutput($object, $module = '')
 {
 	global $conf;
-	if (!is_object($object)) {
+	if (!is_object($object) && empty($module)) {
 		return null;
 	}
-	if (empty($module) && !empty($object->element)) {
+	if (!empty($object->element)) {
 		$module = $object->element;
-	} else {
-		return null;
 	}
-	return $conf->$module->multidir_output[$object->entity];
+	return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)];
 }
 
 /**