diff --git a/lib/shared/dm-ops/create-thread-spec.js b/lib/shared/dm-ops/create-thread-spec.js
index effd2f7e9e..ebe70bc33f 100644
--- a/lib/shared/dm-ops/create-thread-spec.js
+++ b/lib/shared/dm-ops/create-thread-spec.js
@@ -119,7 +119,7 @@ function createThickRawThreadInfo(
     repliesCount: repliesCount ?? 0,
     name,
     avatar,
-    description,
+    description: description ?? '',
     containingThreadID,
     timestamps,
   };
diff --git a/native/chat/settings/thread-settings-description.react.js b/native/chat/settings/thread-settings-description.react.js
index 63dd9ad210..7a4eee394d 100644
--- a/native/chat/settings/thread-settings-description.react.js
+++ b/native/chat/settings/thread-settings-description.react.js
@@ -228,7 +228,7 @@ class ThreadSettingsDescription extends React.PureComponent<Props> {
   };
 
   onPressEdit = () => {
-    this.props.setDescriptionEditValue(this.props.threadInfo.description);
+    this.props.setDescriptionEditValue(this.props.threadInfo.description ?? '');
   };
 
   onSubmit = () => {