diff --git a/js/id/core/way.js b/js/id/core/way.js
index 1e7b32efa..a44ed6545 100644
--- a/js/id/core/way.js
+++ b/js/id/core/way.js
@@ -123,7 +123,7 @@ _.extend(iD.Way.prototype, {
         var childnodes = resolver.childNodes(this);
 
         // Close unclosed way
-        if (close && !this.isClosed()) {
+        if (close && !this.isClosed() && childnodes.length) {
             childnodes = childnodes.concat([childnodes[0]]);
         }