diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index f43db83d1e..a5e8be893d 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -667,9 +667,16 @@ sub main() {
 				}
 				
 				logger (\%Config, $Config{'rb_product_name'} . ' Server restarting (' . $@ . ') in 5 seconds.', 1);
-				# Re-initialize
-				pandora_init(\%Config, pandora_get_initial_product_name() . ' Server');
 				pandora_load_config (\%Config);
+				if (enterprise_load (\%Config) == 0) {
+					$Config{'__enterprise_enabled'} = 0;
+					print_message (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
+					logger (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
+				} else {
+					$Config{'__enterprise_enabled'} = 1;
+					print_message (\%Config, " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.", 1);
+					logger (\%Config, " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.", 1);
+				}
 				pandora_restart (5);
 			}
 			$test_remote = 0;