diff --git a/main.cpp b/main.cpp
index 3cc0398..66b79c3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -74,7 +74,6 @@ int main(int argc, char *argv[])
         check<std::runtime_error>(register_signal_handers());
         logger->logf(LOG_NOTICE, "Starting FlashMQ");
         mainApp->start();
-        logger->noLongerLogToStd();
     }
     catch (std::exception &ex)
     {
diff --git a/mainapp.cpp b/mainapp.cpp
index e7988c6..36afe2a 100644
--- a/mainapp.cpp
+++ b/mainapp.cpp
@@ -332,6 +332,10 @@ void MainApp::start()
     int listen_fd_plain = createListenSocket(this->listenPort, false);
     int listen_fd_ssl = createListenSocket(this->sslListenPort, true);
 
+#ifdef NDEBUG
+    logger->noLongerLogToStd();
+#endif
+
     struct epoll_event ev;
     memset(&ev, 0, sizeof (struct epoll_event));
     ev.data.fd = taskEventFd;