diff --git a/init/ubuntu/walinuxagent.conf b/init/ubuntu/walinuxagent.conf
index 4ba35bc..2ce6608 100644
--- a/init/ubuntu/walinuxagent.conf
+++ b/init/ubuntu/walinuxagent.conf
@@ -22,3 +22,5 @@ pre-start script
 end script
 
 exec /usr/sbin/waagent -daemon
+
+respawn
diff --git a/init/ubuntu/walinuxagent.service b/init/ubuntu/walinuxagent.service
index 9b7a16f..b704219 100755
--- a/init/ubuntu/walinuxagent.service
+++ b/init/ubuntu/walinuxagent.service
@@ -8,6 +8,8 @@ ConditionPathExists=/etc/waagent.conf
 [Service]
 Type=simple
 ExecStart=/usr/sbin/waagent -daemon
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
+