diff --git a/samples/edit-features-using-feature-forms/src/main/java/com/esri/arcgismaps/sample/editfeaturesusingfeatureforms/components/MapViewModel.kt b/samples/edit-features-using-feature-forms/src/main/java/com/esri/arcgismaps/sample/editfeaturesusingfeatureforms/components/MapViewModel.kt
index 82a9ca422..bafae13e1 100644
--- a/samples/edit-features-using-feature-forms/src/main/java/com/esri/arcgismaps/sample/editfeaturesusingfeatureforms/components/MapViewModel.kt
+++ b/samples/edit-features-using-feature-forms/src/main/java/com/esri/arcgismaps/sample/editfeaturesusingfeatureforms/components/MapViewModel.kt
@@ -185,9 +185,7 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
             ).onSuccess { results ->
                 try {
                     results.forEach { result ->
-                        result.geoElements.firstOrNull {
-                            it is ArcGISFeature && (it.featureTable?.layer as? FeatureLayer)?.featureFormDefinition != null
-                        }?.let {
+                        result.geoElements.firstOrNull { it is ArcGISFeature }?.let {
                             val feature = it as ArcGISFeature
                             val layer = feature.featureTable!!.layer as FeatureLayer
                             val featureForm = FeatureForm(feature)