diff --git a/web/components/issues/description-form.tsx b/web/components/issues/description-form.tsx
index 505030945..8596d5fe8 100644
--- a/web/components/issues/description-form.tsx
+++ b/web/components/issues/description-form.tsx
@@ -128,33 +128,24 @@ export const IssueDescriptionForm: FC<IssueDetailsProps> = ({
         <Controller
           name="description_html"
           control={control}
-          render={({ field: { value, onChange } }) => {
-            if (!value) return <></>;
-
-            return (
+          render={({ field: { value, onChange } }) => (
               <RichTextEditor
-                uploadFile={fileService.getUploadFileFunction(workspaceSlug)}
-                deleteFile={fileService.deleteImage}
-                value={value}
-                debouncedUpdatesEnabled={true}
-                setShouldShowAlert={setShowAlert}
-                setIsSubmitting={setIsSubmitting}
-                customClassName={
-                  isAllowed ? "min-h-[150px] shadow-sm" : "!p-0 !pt-2 text-custom-text-200"
-                }
-                noBorder={!isAllowed}
-                onChange={(description: Object, description_html: string) => {
-                  setShowAlert(true);
-                  setIsSubmitting("submitting");
-                  onChange(description_html);
-                  handleSubmit(handleDescriptionFormSubmit)().finally(() =>
-                    setIsSubmitting("submitted")
-                  );
-                }}
-                editable={isAllowed}
-              />
-            );
-          }}
+                  uploadFile={fileService.getUploadFileFunction(workspaceSlug)}
+                  deleteFile={fileService.deleteImage}
+                  value={value}
+                  debouncedUpdatesEnabled={true}
+                  setShouldShowAlert={setShowAlert}
+                  setIsSubmitting={setIsSubmitting}
+                  customClassName={isAllowed ? "min-h-[150px] shadow-sm" : "!p-0 !pt-2 text-custom-text-200"}
+                  noBorder={!isAllowed}
+                  onChange={(description: Object, description_html: string) => {
+                      setShowAlert(true);
+                      setIsSubmitting("submitting");
+                      onChange(description_html);
+                      handleSubmit(handleDescriptionFormSubmit)().finally(() => setIsSubmitting("submitted")
+                      );
+                  } } />
+          )}
         />
         <div
           className={`absolute right-5 bottom-5 text-xs text-custom-text-200 border border-custom-border-400 rounded-xl w-[6.5rem] py-1 z-10 flex items-center justify-center ${isSubmitting === "saved" ? "fadeOut" : "fadeIn"
diff --git a/web/components/issues/draft-issue-form.tsx b/web/components/issues/draft-issue-form.tsx
index 60818190b..49ef7eb0f 100644
--- a/web/components/issues/draft-issue-form.tsx
+++ b/web/components/issues/draft-issue-form.tsx
@@ -414,30 +414,23 @@ export const DraftIssueForm: FC<IssueFormProps> = (props) => {
                   <Controller
                     name="description_html"
                     control={control}
-                    render={({ field: { value, onChange } }) => {
-                      if (!value && !watch("description_html")) return <></>;
-
-                      return (
+                    render={({ field: { value, onChange } }) => (
                         <RichTextEditorWithRef
-                          uploadFile={fileService.getUploadFileFunction(workspaceSlug  as string)}
-                          deleteFile={fileService.deleteImage}
-                          ref={editorRef}
-                          debouncedUpdatesEnabled={false}
-                          value={
-                            !value ||
-                            value === "" ||
-                            (typeof value === "object" && Object.keys(value).length === 0)
-                              ? watch("description_html")
-                              : value
-                          }
-                          customClassName="min-h-[150px]"
-                          onChange={(description: Object, description_html: string) => {
-                            onChange(description_html);
-                            setValue("description", description);
-                          }}
-                        />
-                      );
-                    }}
+                            uploadFile={fileService.getUploadFileFunction(workspaceSlug as string)}
+                            deleteFile={fileService.deleteImage}
+                            ref={editorRef}
+                            debouncedUpdatesEnabled={false}
+                            value={!value ||
+                                value === "" ||
+                                (typeof value === "object" && Object.keys(value).length === 0)
+                                ? watch("description_html")
+                                : value}
+                            customClassName="min-h-[150px]"
+                            onChange={(description: Object, description_html: string) => {
+                                onChange(description_html);
+                                setValue("description", description);
+                            } } />
+                    )}
                   />
                   <GptAssistantModal
                     isOpen={gptAssistantModal}
diff --git a/web/components/web-view/issue-web-view-form.tsx b/web/components/web-view/issue-web-view-form.tsx
index 8a791e9ac..3f692b701 100644
--- a/web/components/web-view/issue-web-view-form.tsx
+++ b/web/components/web-view/issue-web-view-form.tsx
@@ -119,39 +119,29 @@ export const IssueWebViewForm: React.FC<Props> = (props) => {
           <Controller
             name="description_html"
             control={control}
-            render={({ field: { value, onChange } }) => {
-              if (!value) return <></>;
-
-              return (
+            render={({ field: { value, onChange } }) => (
                 <RichTextEditor
-                  uploadFile={fileService.getUploadFileFunction(workspaceSlug as string)}
-                  deleteFile={fileService.deleteImage}
-                  value={
-                    !value ||
-                    value === "" ||
-                    (typeof value === "object" && Object.keys(value).length === 0)
-                      ? "<p></p>"
-                      : value
-                  }
-                  debouncedUpdatesEnabled={true}
-                  setShouldShowAlert={setShowAlert}
-                  setIsSubmitting={setIsSubmitting}
-                  customClassName={
-                    isAllowed ? "min-h-[150px] shadow-sm" : "!p-0 !pt-2 text-custom-text-200"
-                  }
-                  noBorder={!isAllowed}
-                  onChange={(description: Object, description_html: string) => {
-                    setShowAlert(true);
-                    setIsSubmitting("submitting");
-                    onChange(description_html);
-                    handleSubmit(handleDescriptionFormSubmit)().finally(() =>
-                      setIsSubmitting("submitted")
-                    );
-                  }}
-                  editable={isAllowed}
-                />
-              );
-            }}
+                    uploadFile={fileService.getUploadFileFunction(workspaceSlug as string)}
+                    deleteFile={fileService.deleteImage}
+                    value={!value ||
+                        value === "" ||
+                        (typeof value === "object" && Object.keys(value).length === 0)
+                        ? "<p></p>"
+                        : value}
+                    debouncedUpdatesEnabled={true}
+                    setShouldShowAlert={setShowAlert}
+                    setIsSubmitting={setIsSubmitting}
+                    customClassName={isAllowed ? "min-h-[150px] shadow-sm" : "!p-0 !pt-2 text-custom-text-200"}
+                    noBorder={!isAllowed}
+                    onChange={(description: Object, description_html: string) => {
+                        setShowAlert(true);
+                        setIsSubmitting("submitting");
+                        onChange(description_html);
+                        handleSubmit(handleDescriptionFormSubmit)().finally(() => setIsSubmitting("submitted")
+                        );
+                    } }
+                    editable={isAllowed} />
+            )}
           />
           <div
             className={`absolute right-5 bottom-5 text-xs text-custom-text-200 border border-custom-border-400 rounded-xl w-[6.5rem] py-1 z-10 flex items-center justify-center ${