diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c
index 74966e6952..a62cc0638c 100644
--- a/orte/orted/orted_main.c
+++ b/orte/orted/orted_main.c
@@ -577,6 +577,13 @@ int orte_daemon(int argc, char *argv[])
             ORTE_ERROR_LOG(ret);
             goto DONE;
         }
+        /* set the lifeline to point to our parent so that we
+         * can handle the situation if that lifeline goes away
+         */
+        if (ORTE_SUCCESS != (ret = orte_routed.set_lifeline(&parent))) {
+            ORTE_ERROR_LOG(ret);
+            goto DONE;
+        }
     }
 
     /* if we are not the HNP...the only time we will be an HNP