diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.js
index ba9599821fcb34c1f899f5e01bc23b9447131bc1..2d25cbe8423ec1a18330fe8e2857228a35c1cd27 100644
--- a/packages/desktop-client/src/components/accounts/TransactionsTable.js
+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js
@@ -762,7 +762,6 @@ export const Transaction = React.memo(function Transaction(props) {
             <AccountAutocomplete
               value={accountId}
               accounts={accounts}
-              includeClosedAccounts
               shouldSaveFromKey={shouldSaveFromKey}
               tableBehavior={true}
               focused={true}
diff --git a/packages/desktop-client/src/components/schedules/EditSchedule.js b/packages/desktop-client/src/components/schedules/EditSchedule.js
index 3433222221f26c3a0ff50f8a36e837169e7a1975..e8fcb19c451328d749538f3260fb441144e0af80 100644
--- a/packages/desktop-client/src/components/schedules/EditSchedule.js
+++ b/packages/desktop-client/src/components/schedules/EditSchedule.js
@@ -442,6 +442,7 @@ export default function ScheduleDetails() {
         <FormField style={{ flex: 1 }}>
           <FormLabel title="Account" />
           <AccountAutocomplete
+            includeClosedAccounts={false}
             value={state.fields.account}
             inputProps={{ placeholder: '(none)' }}
             onSelect={id =>
diff --git a/packages/desktop-client/src/components/util/GenericInput.js b/packages/desktop-client/src/components/util/GenericInput.js
index 4813dd8a48d55936cce6fdb5ca3b4fcc8d0db462..8d8c6aeaf030295ae471f118296d2e13ee83cdb4 100644
--- a/packages/desktop-client/src/components/util/GenericInput.js
+++ b/packages/desktop-client/src/components/util/GenericInput.js
@@ -66,7 +66,6 @@ export default function GenericInput({
           content = (
             <AccountAutocomplete
               accounts={accounts}
-              includeClosedAccounts
               value={value}
               multi={multi}
               openOnFocus={false}
diff --git a/packages/loot-design/src/components/AccountAutocomplete.js b/packages/loot-design/src/components/AccountAutocomplete.js
index 7b2acadd31a36be673c9da5dba0c75521eb42798..e0e43e4d4ef0afde075d4ef143361adae1f4b4cf 100644
--- a/packages/loot-design/src/components/AccountAutocomplete.js
+++ b/packages/loot-design/src/components/AccountAutocomplete.js
@@ -68,7 +68,7 @@ export function AccountList({
 
 export default function AccountAutocomplete({
   embedded,
-  includeClosedAccounts = false,
+  includeClosedAccounts = true,
   ...props
 }) {
   let accounts = useCachedAccounts() || [];
diff --git a/packages/loot-design/src/components/modals/EditField.js b/packages/loot-design/src/components/modals/EditField.js
index a9c2208c5427de343813d2d489d56dc482f9ccd3..9b0277d6814aebff0c43318b749029b48d2d4311 100644
--- a/packages/loot-design/src/components/modals/EditField.js
+++ b/packages/loot-design/src/components/modals/EditField.js
@@ -72,7 +72,6 @@ function EditField({
         <AccountAutocomplete
           value={null}
           accounts={accounts}
-          includeClosedAccounts
           focused={true}
           embedded={true}
           onSelect={value => {