diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 69aeee48a4b..b2d37e8fc67 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -816,12 +816,9 @@ void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges, int calc_tessface)
 
 		/* would only be converting back again, don't bother */
 		tessface_input = TRUE;
-
-		/* it also happens that converting the faces calculates edges, skip this */
-		calc_edges = FALSE;
 	}
 
-	if (calc_edges || (mesh->totpoly && mesh->totedge == 0))
+	if (calc_edges || ((mesh->totpoly || mesh->totface) && mesh->totedge == 0))
 		BKE_mesh_calc_edges(mesh, calc_edges);
 
 	if (calc_tessface) {