diff --git a/imgui.cpp b/imgui.cpp
index 5de5f63e1173..7383e9c497f7 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -13023,6 +13023,7 @@ void ImGui::DockContextProcessUndockWindow(ImGuiContext* ctx, ImGuiWindow* windo
     window->DockIsActive = false;
     window->DockNodeIsVisible = window->DockTabIsVisible = false;
     window->Size = window->SizeFull = FixLargeWindowsWhenUndocking(window->SizeFull, window->Viewport);
+    window->DockNodeAsHost = NULL;
 
     MarkIniSettingsDirty();
 }