diff --git a/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx b/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx
index 6eda6739d..0f1ce92e1 100644
--- a/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx
+++ b/packages/pl-fe/src/features/draft-statuses/components/draft-status-action-bar.tsx
@@ -3,6 +3,7 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { setComposeToStatus } from 'pl-fe/actions/compose';
 import { cancelDraftStatus } from 'pl-fe/actions/draft-statuses';
+import { fetchStatus } from 'pl-fe/actions/statuses';
 import Button from 'pl-fe/components/ui/button';
 import HStack from 'pl-fe/components/ui/hstack';
 import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch';
@@ -11,7 +12,6 @@ import { useSettingsStore } from 'pl-fe/stores/settings';
 
 import type { Status as StatusEntity } from 'pl-fe/normalizers/status';
 import type { DraftStatus } from 'pl-fe/reducers/draft-statuses';
-import { fetchStatus } from 'pl-fe/actions/statuses';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.draft_status_delete.confirm', defaultMessage: 'Discard' },
diff --git a/packages/pl-fe/src/reducers/compose.ts b/packages/pl-fe/src/reducers/compose.ts
index 495558c82..50eaa631f 100644
--- a/packages/pl-fe/src/reducers/compose.ts
+++ b/packages/pl-fe/src/reducers/compose.ts
@@ -306,7 +306,7 @@ const importAccount = (compose: Compose, account: CredentialAccount) => {
 
   if (settings.defaultPrivacy) compose.privacy = settings.defaultPrivacy;
   if (settings.defaultContentType) compose.content_type = settings.defaultContentType;
-  compose.tagHistory = tagHistory.get(account.id);
+  compose.tagHistory = tagHistory.get(account.id) || [];
 };
 
 // const updateSetting = (compose: Compose, path: string[], value: string) => {