diff --git a/main/gui/source/init/tasks.cpp b/main/gui/source/init/tasks.cpp
index d9bcc7ecb..1c5f2797a 100644
--- a/main/gui/source/init/tasks.cpp
+++ b/main/gui/source/init/tasks.cpp
@@ -76,7 +76,6 @@ namespace hex::init {
         if (ImGui::GetCurrentContext() != nullptr) {
             if (ImGui::GetIO().Fonts != nullptr) {
                 ImGui::GetIO().Fonts->Locked = false;
-                ImGui::GetIO().Fonts = nullptr;
             }
         }
 
diff --git a/plugins/fonts/include/font_atlas.hpp b/plugins/fonts/include/font_atlas.hpp
index 3b2ada58f..c2b5f9d4d 100644
--- a/plugins/fonts/include/font_atlas.hpp
+++ b/plugins/fonts/include/font_atlas.hpp
@@ -120,7 +120,9 @@ namespace hex::fonts {
         ~FontAtlas() {
             if (m_fontAtlas != nullptr) {
                 m_fontAtlas->Locked = false;
-                IM_DELETE(m_fontAtlas);
+                if (ImGui::GetIO().Fonts != m_fontAtlas) {
+                    IM_DELETE(m_fontAtlas);
+                }
                 m_fontAtlas = nullptr;
             }
         }