diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
index a5c75d99b..93bd06fc1 100644
--- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
+++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
@@ -138,7 +138,7 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
         return
       }
 
-      if (note.noteType === NoteType.Super) {
+      if (note.noteType === NoteType.Super && note.text.length > 0) {
         setPendingConversionItem(itemToBeSelected)
         handleDisableClickoutsideRequest?.()
         return
diff --git a/packages/web/src/javascripts/Components/SuperEditor/SuperNoteConverter.tsx b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteConverter.tsx
index f713e4d9a..9c05da220 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/SuperNoteConverter.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/SuperNoteConverter.tsx
@@ -43,6 +43,10 @@ const SuperNoteConverter = ({
   }, [component, noteType])
 
   const convertedContent = useMemo(() => {
+    if (note.text.length === 0) {
+      return note.text
+    }
+
     return exportSuperNote(note, format)
   }, [format, note])