diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index dc47d90872..c106251a1c 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12  Sergio Martin <sergio.martin@artica.es>
+
+	* bin/pandora_server: Fixed policy queue when the server is launched
+	in daemon mode for bug 3390085 
+
 2011-08-12  Ramon Novoa  <rnovoa@artica.es>
 
 	* conf/pandora_server.conf: Added enterprise configuration tokens to
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index a2eaecbdf8..00c87d7383 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -192,17 +192,17 @@ if (enterprise_load (\%Config) == 0) {
 	print_message (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
 }
 
-# Start thread to patrol policy queue
-if ($Config{'pandora_master'} == 1) {
-	my $thr = threads->create('pandora_process_policy_queue', (\%Config));
-}
-
 # Daemonize and put in background
 if ($Config{'daemon'} == 1) {
 	print_message (\%Config, " [*] Backgrounding Pandora FMS Server process.\n", 1);
 	pandora_daemonize (\%Config);
 }
 
+# Start thread to patrol policy queue
+if ($Config{'pandora_master'} == 1) {
+	my $thr = threads->create('pandora_process_policy_queue', (\%Config));
+}
+
 # Start the servers
 pandora_startup ();