diff --git a/app/models/miq_server.rb b/app/models/miq_server.rb
index d176577be0f..27812e782f6 100644
--- a/app/models/miq_server.rb
+++ b/app/models/miq_server.rb
@@ -243,6 +243,7 @@ def self.start
     Vmdb::Appliance.log_config_on_startup
 
     server.ntp_reload
+    server.set_database_application_name
 
     EvmDatabase.seed_last
 
@@ -459,6 +460,10 @@ def database_application_name
     "MIQ #{Process.pid} Server[#{compressed_id}], #{zone.name}[#{zone.compressed_id}]".truncate(64)
   end
 
+  def set_database_application_name
+    ArApplicationName.name = database_application_name
+  end
+
   def is_local?
     guid == MiqServer.my_guid
   end
diff --git a/lib/workers/evm_server.rb b/lib/workers/evm_server.rb
index da0e5ba6d98..b7c476163c5 100644
--- a/lib/workers/evm_server.rb
+++ b/lib/workers/evm_server.rb
@@ -62,7 +62,6 @@ def start
 
     PidFile.create(MiqServer.pidfile)
     set_process_title
-    set_database_application_name
     MiqServer.start
   rescue Interrupt => e
     process_hard_signal(e.message)
@@ -78,14 +77,6 @@ def set_process_title
     Process.setproctitle(SERVER_PROCESS_TITLE) if Process.respond_to?(:setproctitle)
   end
 
-  def set_database_application_name
-    ArApplicationName.name = database_application_name
-  end
-
-  def database_application_name
-    MiqServer.my_server.database_application_name
-  end
-
   def self.start(*args)
     # Parse the args into the global config variable
     cfg = {}