diff --git a/kafel b/kafel
index 722b93a..8e69b8e 160000
--- a/kafel
+++ b/kafel
@@ -1 +1 @@
-Subproject commit 722b93a630e53ca472a4c69f61cb3dfc44ea5041
+Subproject commit 8e69b8efae415cde3debffbb1e379d9e7a16835a
diff --git a/nsjail.cc b/nsjail.cc
index fd44155..691f4dd 100644
--- a/nsjail.cc
+++ b/nsjail.cc
@@ -226,7 +226,9 @@ int main(int argc, char* argv[]) {
 
 	sandbox::closePolicy(nsjconf.get());
 	/* Try to restore the underlying console's params in case some program has changed it */
-	nsjail::setTC(STDIN_FILENO, trm.get());
+	if (!nsjconf->daemonize) {
+		nsjail::setTC(STDIN_FILENO, trm.get());
+	}
 
 	LOG_D("Returning with %d", ret);
 	return ret;