diff --git a/src/components/Facility/DischargeModal.tsx b/src/components/Facility/DischargeModal.tsx
index 672c37a5d5e..eea45055219 100644
--- a/src/components/Facility/DischargeModal.tsx
+++ b/src/components/Facility/DischargeModal.tsx
@@ -102,8 +102,6 @@ const DischargeModal = ({
     enabled: consultationData.id !== undefined,
   });
 
-  if (isLoading) return <Loading />;
-
   if (error) {
     Notification.Error({ msg: t("ERROR_FETCHING_CONSULTATION") });
   }
@@ -191,6 +189,8 @@ const DischargeModal = ({
         : "discharge_date"
     ];
 
+  if (isLoading) return <Loading />;
+
   return (
     <>
       <ConfirmDialog