diff --git a/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp b/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp
index 1d6fa9f..106eb70 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Singleton.hpp
@@ -9,6 +9,7 @@
 
 #include <EASTL/array.h>
 #include <EASTL/bit.h>
+#include <EASTL/optional.h>
 #include <EASTL/type_traits.h>
 #include <EASTL/utility.h>
 
@@ -32,7 +33,7 @@ class Singleton
      */
     static constexpr TYPE& Instance()
     {
-        return *eastl::bit_cast<TYPE*>(ms_instance.data());
+        return ms_instance.value();
     }
 
     class Lifetime
@@ -78,9 +79,7 @@ class Singleton
     template<typename... ARGS>
     static void Initialize(ARGS&&... p_args)
     {
-        new (ms_instance.data()) TYPE(eastl::forward<ARGS>(p_args)...);
-
-        ms_initialized = true;
+        ms_instance.emplace(eastl::forward<ARGS>(p_args)...);
     }
 
     /**
@@ -89,20 +88,13 @@ class Singleton
      */
     static void Finalize()
     {
-        eastl::bit_cast<TYPE*>(ms_instance.data())->~TYPE();
-
-        ms_initialized = false;
+        ms_instance.reset();
     }
 
     /**
      * The singleton.
      */
-    alignas(alignof(TYPE)) inline static eastl::array<std::byte, sizeof(TYPE)> ms_instance;
-
-    /**
-     * Is the singleton initialized?
-     */
-    inline static bool ms_initialized = false;
+    inline static eastl::optional<TYPE> ms_instance;
 };
 }   // namespace Bigfoot
 #endif