diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index e40658bf4e0..aa6c9a1a858 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -2339,7 +2339,7 @@ static void drawmeshwire(Object *ob)
 
 	if(ob==G.obedit || (G.obedit && ob->data==G.obedit->data)) {
 		
-		if( (me->flag & ME_OPT_EDGES) && (me->flag & ME_SUBSURF)) handles= 1;
+		if( (me->flag & ME_OPT_EDGES) && (me->flag & ME_SUBSURF) && me->subdiv) handles= 1;
 		
 		if(handles==0 && (G.f & (G_FACESELECT+G_DRAWFACES))) {	/* faces */
 			char col1[4], col2[4];