diff --git a/src/core/ReactInstanceHandles.js b/src/core/ReactInstanceHandles.js
index a4ddec7592..c077c88108 100644
--- a/src/core/ReactInstanceHandles.js
+++ b/src/core/ReactInstanceHandles.js
@@ -302,6 +302,11 @@ var ReactInstanceHandles = {
             firstChildren.length = childIndex = 0;
             firstChildren.push(child.firstChild);
             break;
+          } else {
+            // TODO This should not be necessary if the ID hierarchy is
+            // correct, but is occasionally necessary if the DOM has been
+            // modified in unexpected ways.
+            firstChildren.push(child.firstChild);
           }
         } else {
           // If this child had no ID, then there's a chance that it was