diff --git a/cmd/ha/main.go b/cmd/ha/main.go
index 66e508964..3eb9b5537 100644
--- a/cmd/ha/main.go
+++ b/cmd/ha/main.go
@@ -75,7 +75,7 @@ Options:
 
 	t, err := client.Model()
 	if err != nil {
-		log.PanicErrorf(err, "rpc fetch model failed")
+		log.ErrorErrorf(err, "rpc fetch model failed")
 	}
 	log.Warnf("topom =\n%s", t.Encode())
 
@@ -83,7 +83,7 @@ Options:
 
 	overview, err := client.Overview()
 	if err != nil {
-		log.PanicErrorf(err, "rpc fetch overview failed")
+		log.ErrorErrorf(err, "rpc fetch overview failed")
 	}
 	prodcutAuth := overview.Config.ProductAuth
 
@@ -121,7 +121,7 @@ type HealthyChecker struct {
 func newHealthyChecker(client *topom.ApiClient) *HealthyChecker {
 	stats, err := client.Stats()
 	if err != nil {
-		log.PanicErrorf(err, "rpc stats failed")
+		log.ErrorErrorf(err, "rpc stats failed")
 	}
 
 	hc := &HealthyChecker{Stats: stats}
diff --git a/config/redis.conf b/config/redis.conf
index 7f99b506e..44235aba1 100644
--- a/config/redis.conf
+++ b/config/redis.conf
@@ -125,7 +125,7 @@ tcp-keepalive 300
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize yes
+daemonize no
 
 # If you run Redis from upstart or systemd, Redis can interact with your
 # supervision tree. Options:
diff --git a/extern/redis-3.2.8/redis.conf b/extern/redis-3.2.8/redis.conf
index 7f99b506e..44235aba1 100644
--- a/extern/redis-3.2.8/redis.conf
+++ b/extern/redis-3.2.8/redis.conf
@@ -125,7 +125,7 @@ tcp-keepalive 300
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize yes
+daemonize no
 
 # If you run Redis from upstart or systemd, Redis can interact with your
 # supervision tree. Options: