diff --git a/imgui_draw.cpp b/imgui_draw.cpp
index 92124118..0f3cf4dc 100644
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@@ -599,7 +599,10 @@ void ImDrawList::_OnChangedTexture()
         AddDrawCmd();
         return;
     }
-    IM_ASSERT(curr_cmd->UserCallback == NULL);
+
+    // Unlike other _OnChangedXXX functions this may be called by ImFontAtlasUpdateDrawListsTextures() in more locations so we need to handle this case.
+    if (curr_cmd->UserCallback != NULL)
+        return;
 
     // Try to merge with previous command if it matches, else use current command
     ImDrawCmd* prev_cmd = curr_cmd - 1;