diff --git a/include/cli_startup.php b/include/cli_startup.php
index 236fd1442..d43bc1c94 100644
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -24,9 +24,6 @@ function cli_startup() {
 	load_config('config');
 	load_config('system');
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
-
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
diff --git a/include/notifier.php b/include/notifier.php
index a90e18062..a3286355d 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -65,9 +65,6 @@ function notifier_run(&$argv, &$argc){
 	load_config('config');
 	load_config('system');
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
-
 	load_hooks();
 
 	if($argc < 3)
diff --git a/include/onepoll.php b/include/onepoll.php
index 737f70a28..f38f6b4c6 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -37,9 +37,6 @@ function onepoll_run(&$argv, &$argc){
 	load_config('config');
 	load_config('system');
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
-
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
diff --git a/include/poller.php b/include/poller.php
index 0bbead189..e927430ea 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -30,9 +30,6 @@ function poller_run(&$argv, &$argc){
 	load_config('config');
 	load_config('system');
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
-
 	$maxsysload = intval(get_config('system','maxloadavg'));
 	if($maxsysload < 1)
 		$maxsysload = 50;
diff --git a/include/queue.php b/include/queue.php
index f277b3fbd..64cccad21 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -25,9 +25,6 @@ function queue_run(&$argv, &$argc){
 	load_config('config');
 	load_config('system');
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
-
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
diff --git a/index.php b/index.php
index 67c0c495c..6b6e873ea 100644
--- a/index.php
+++ b/index.php
@@ -53,9 +53,6 @@ if(!$install) {
 	load_config('config');
 	load_config('system');
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
-
 	require_once("include/session.php");
 	load_hooks();
 	call_hooks('init_1');