diff --git a/src/lib66/exec/ssexec_remove.c b/src/lib66/exec/ssexec_remove.c
index 4ec3ea9eb334bfed5d2c3995a986ad20739ceb1c..08490c5220b4769b5faf316db3e8ace086b48ed9 100644
--- a/src/lib66/exec/ssexec_remove.c
+++ b/src/lib66/exec/ssexec_remove.c
@@ -56,6 +56,9 @@ static void remove_service(resolve_service_t *res, ssexec_t *info)
 
     free(path) ;
 
+    if (res->environ.envdir)
+        auto_remove(res->sa.s + res->environ.envdir) ;
+
     tree_service_remove(info->base.s, res->sa.s + res->treename, res->sa.s + res->name) ;
 
     if ((res->logger.want && (res->type == TYPE_CLASSIC || res->type == TYPE_ONESHOT)) && !res->inmodule) {