diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index eb7e5ddcf6..e994c82152 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -106,13 +106,11 @@ then
     echo "Copying new version of pandora_agent_daemon service"
     cp -f /usr/share/pandora_agent/pandora_agent_daemon.service /usr/lib/systemd/system/
 	chmod -x /usr/lib/systemd/system/pandora_agent_daemon.service
-# Enable the services on SystemD
+    # Enable the services on SystemD
     systemctl enable pandora_agent_daemon.service
-else
-	chkconfig pandora_agent_daemon on
     if [ "$?" -gt 0 ]
     then
-            echo "There was a problem configuring pandora_agent_daemon service to run on boot. Please enable it manually."
+	    chkconfig pandora_agent_daemon on || echo "There was a problem configuring pandora_agent_daemon service to run on boot. Please enable it manually."
     fi
 fi