diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart
index 1ca4b56e..8f3c3be3 100644
--- a/lib/pages/pets_page/pets_page_model.dart
+++ b/lib/pages/pets_page/pets_page_model.dart
@@ -270,13 +270,28 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
 
   void clearFields() {
     uploadedLocalFile = null;
-    textControllerName.text = '';
-    textControllerSpecies.text = '';
-    textControllerRace.text = '';
-    textControllerColor.text = '';
-    textControllerData.text = '';
-    textControllerObservation.text = '';
-    dropDownValueController1 = FormFieldController<String>('');
-    dropDownValueController2 = FormFieldController<String>('');
+    textControllerName!.clear();
+    textControllerName!.clearComposing();
+
+    textControllerSpecies!.clear();
+    textControllerSpecies!.clearComposing();
+
+    textControllerRace!.clear();
+    textControllerRace!.clearComposing();
+
+    textControllerColor!.clear();
+    textControllerColor!.clearComposing();
+
+    textControllerData!.clear();
+    textControllerData!.clearComposing();
+
+    textControllerObservation!.clear();
+    textControllerObservation!.clearComposing();
+
+    dropDownValue1 = null;
+    dropDownValue2 = null;
+
+    dropDownValueController1 = FormFieldController<String>(null);
+    dropDownValueController2 = FormFieldController<String>(null);
   }
 }