diff --git a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
index 1ba6c109d..2b18e3c8b 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -117,10 +117,10 @@ export default function BillDetailEditcontainer() {
   };
 
   useEffect(() => {
-    if (search.billid) {
+    if (search.billid && data) {
       form.resetFields();
     }
-  }, [form, search.billid]);
+  }, [form, search.billid, data]);
 
   if (error) return <AlertComponent message={error.message} type="error" />;
   if (!!!search.billid) return <div>{t("bills.labels.noneselected")}</div>;
@@ -136,7 +136,7 @@ export default function BillDetailEditcontainer() {
       }}
       visible={search.billid}
     >
-      {loading && <LoadingSkeleton  />}
+      {loading && <LoadingSkeleton />}
       {!loading && (
         <>
           <PageHeader