diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp b/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp
index f5bba41..79be60a 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Log/Log.hpp
@@ -41,18 +41,6 @@ class Log
     Log(const Log& p_logger) = delete;
     Log(Log&& p_logger) = delete;
 
-    /**
-     * Starts the logger backend
-     *
-     */
-    void Start();
-
-    /**
-     * Stops the logger backend
-     *
-     */
-    void Stop();
-
     /**
      * Register a logger.
      *
diff --git a/Bigfoot/Sources/Utils/Log/Log.cpp b/Bigfoot/Sources/Utils/Log/Log.cpp
index c243910..033594b 100644
--- a/Bigfoot/Sources/Utils/Log/Log.cpp
+++ b/Bigfoot/Sources/Utils/Log/Log.cpp
@@ -12,6 +12,8 @@ namespace Bigfoot
 {
 Log::Log()
 {
+    quill::Backend::start();
+
     m_sinks[static_cast<std::size_t>(Flat::LogSinkType::Console)] =
         quill::Frontend::create_or_get_sink<quill::ConsoleSink>(
             std::string {Flat::EnumNameLogSinkType(Flat::LogSinkType::Console)});
@@ -19,21 +21,6 @@ Log::Log()
 
 /****************************************************************************************/
 
-void Log::Start()
-{
-    quill::Backend::start();
-}
-
-/****************************************************************************************/
-
-void Log::Stop()
-{
-    Flush();
-    quill::Backend::stop();
-}
-
-/****************************************************************************************/
-
 quill::Logger* Log::RegisterLogger(const LoggerInfo& p_loggerInfo)
 {
     quill::Logger* logger = quill::Frontend::create_or_get_logger(
@@ -114,10 +101,12 @@ void Log::Flush()
 
 Log::~Log()
 {
+    Flush();
     for (quill::Logger* logger: quill::Frontend::get_all_loggers())
     {
-        quill::Frontend::remove_logger(logger);
+        quill::Frontend::remove_logger_blocking(logger);
     }
+    quill::Backend::stop();
 }
 }   // namespace Bigfoot
 #endif
diff --git a/Bigfoot/Tests/Engine/EngineTests/Environment.cpp b/Bigfoot/Tests/Engine/EngineTests/Environment.cpp
index e15c809..be2a17f 100644
--- a/Bigfoot/Tests/Engine/EngineTests/Environment.cpp
+++ b/Bigfoot/Tests/Engine/EngineTests/Environment.cpp
@@ -16,15 +16,15 @@ class TestingEnvironment: public ::testing::Environment
   public:
     void SetUp() override
     {
-        BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::GetInstance().Start());
+        BIGFOOT_NOT_OPTIMIZED_ONLY(m_lifetime.emplace());
     }
 
     void TearDown() override
     {
-        BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::GetInstance().Stop());
+        BIGFOOT_NOT_OPTIMIZED_ONLY(m_lifetime.reset());
     }
 
-    BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::Lifetime m_lifetime);
+    BIGFOOT_NOT_OPTIMIZED_ONLY(eastl::optional<Singleton<Log>::Lifetime> m_lifetime);
 };
 }   // namespace Bigfoot
 
diff --git a/Bigfoot/Tests/System/SystemTests/Environment.cpp b/Bigfoot/Tests/System/SystemTests/Environment.cpp
index e15c809..be2a17f 100644
--- a/Bigfoot/Tests/System/SystemTests/Environment.cpp
+++ b/Bigfoot/Tests/System/SystemTests/Environment.cpp
@@ -16,15 +16,15 @@ class TestingEnvironment: public ::testing::Environment
   public:
     void SetUp() override
     {
-        BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::GetInstance().Start());
+        BIGFOOT_NOT_OPTIMIZED_ONLY(m_lifetime.emplace());
     }
 
     void TearDown() override
     {
-        BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::GetInstance().Stop());
+        BIGFOOT_NOT_OPTIMIZED_ONLY(m_lifetime.reset());
     }
 
-    BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::Lifetime m_lifetime);
+    BIGFOOT_NOT_OPTIMIZED_ONLY(eastl::optional<Singleton<Log>::Lifetime> m_lifetime);
 };
 }   // namespace Bigfoot
 
diff --git a/Bigfoot/Tests/Utils/UtilsTests/Environment.cpp b/Bigfoot/Tests/Utils/UtilsTests/Environment.cpp
index e15c809..be2a17f 100644
--- a/Bigfoot/Tests/Utils/UtilsTests/Environment.cpp
+++ b/Bigfoot/Tests/Utils/UtilsTests/Environment.cpp
@@ -16,15 +16,15 @@ class TestingEnvironment: public ::testing::Environment
   public:
     void SetUp() override
     {
-        BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::GetInstance().Start());
+        BIGFOOT_NOT_OPTIMIZED_ONLY(m_lifetime.emplace());
     }
 
     void TearDown() override
     {
-        BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::GetInstance().Stop());
+        BIGFOOT_NOT_OPTIMIZED_ONLY(m_lifetime.reset());
     }
 
-    BIGFOOT_NOT_OPTIMIZED_ONLY(Singleton<Log>::Lifetime m_lifetime);
+    BIGFOOT_NOT_OPTIMIZED_ONLY(eastl::optional<Singleton<Log>::Lifetime> m_lifetime);
 };
 }   // namespace Bigfoot