diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3e4a8765..82ab6941 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -41,11 +41,13 @@ VERSION 1.61 WIP
 
 Breaking Changes:
 (IN PROGRESS, WILL ADD TO THIS LIST AS WE WORK ON 1.61)
+
  - Misc: IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.
 
 Other Changes:
 (IN PROGRESS, WILL ADD TO THIS LIST AS WE WORK ON 1.61)
-- ...
+
+- Settings: Fixed saving an empty .ini file if CreateContext/DestroyContext are called without a single call to NewFrame(). (#1741)
 
 -----------------------------------------------------------------------
 
diff --git a/imgui.cpp b/imgui.cpp
index 05850302..6b7ce2f0 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -3676,7 +3676,9 @@ void ImGui::Shutdown(ImGuiContext* context)
     if (!g.Initialized)
         return;
 
-    SaveIniSettingsToDisk(g.IO.IniFilename);
+    // Save settings (unless we haven't attempted to load them: CreateContext/DestroyContext without a call to NewFrame shouldn't save an empty file)
+    if (g.SettingsLoaded)
+        SaveIniSettingsToDisk(g.IO.IniFilename);
 
     // Clear everything else
     for (int i = 0; i < g.Windows.Size; i++)