diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 1867a5abb0..36cf4dc018 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -665,7 +665,9 @@ module.exports = React.createClass({
                     break;
                 }
             }
-            debuglog("had to find tracked node again for " + scrollState.trackedScrollToken);
+            if (node) {
+                debuglog("had to find tracked node again for " + scrollState.trackedScrollToken);
+            }
             scrollState.trackedNode = node;
         }