diff --git a/lib/java_buildpack/framework/app_dynamics_agent.rb b/lib/java_buildpack/framework/app_dynamics_agent.rb
index 545ff70daa..dada5ce87b 100644
--- a/lib/java_buildpack/framework/app_dynamics_agent.rb
+++ b/lib/java_buildpack/framework/app_dynamics_agent.rb
@@ -138,8 +138,8 @@ def tier_name(java_opts, credentials)
       end
 
       def unique_host_name(java_opts)
-        name = @configuration['default_unique_host_name']
-        name = Shellwords.escape(@application.details['application_name']) if @application.details['application_name']
+        name = Shellwords.escape(@application.details['application_name'])
+        name = @configuration['default_unique_host_name'] if @configuration['default_unique_host_name']
 
         java_opts.add_system_property('appdynamics.agent.uniqueHostId', name.to_s)
       end