diff --git a/lib/OpenLayers/Control/ModifyFeature.js b/lib/OpenLayers/Control/ModifyFeature.js
index a1b1244484..8b381420f6 100644
--- a/lib/OpenLayers/Control/ModifyFeature.js
+++ b/lib/OpenLayers/Control/ModifyFeature.js
@@ -261,7 +261,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
             this.layer.removeFeatures(this.virtualVertices);
             this.vertices = [];
             this.dragControl.deactivate();
-            if(this.feature) {
+            if(this.feature && this.feature.geometry) {
                 this.selectControl.unselect.apply(this.selectControl,
                                                   [this.feature]);
             }