diff --git a/lib/di.dart b/lib/di.dart
index 5a2eb7285..493fe3e1d 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -419,16 +419,16 @@ Future setup(
           getIt.get<MoneroAccountEditOrCreateViewModel>()));*/
 
   getIt.registerFactoryParam<MoneroAccountEditOrCreateViewModel,
-          AccountListItem, void>(
-      (AccountListItem account, _) => MoneroAccountEditOrCreateViewModel(
+          AccountListItem?, void>(
+      (AccountListItem? account, _) => MoneroAccountEditOrCreateViewModel(
           monero!.getAccountList(getIt.get<AppStore>().wallet!),
           haven?.getAccountList(getIt.get<AppStore>().wallet!),
           wallet: getIt.get<AppStore>().wallet!,
           accountListItem: account));
 
-  getIt.registerFactoryParam<MoneroAccountEditOrCreatePage, AccountListItem,
+  getIt.registerFactoryParam<MoneroAccountEditOrCreatePage, AccountListItem?,
           void>(
-      (AccountListItem account, _) => MoneroAccountEditOrCreatePage(
+      (AccountListItem? account, _) => MoneroAccountEditOrCreatePage(
           moneroAccountCreationViewModel:
               getIt.get<MoneroAccountEditOrCreateViewModel>(param1: account)));
 
diff --git a/lib/router.dart b/lib/router.dart
index 5f4618656..45459a08e 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -293,7 +293,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.accountCreation:
       return CupertinoPageRoute<String>(
           builder: (_) => getIt.get<MoneroAccountEditOrCreatePage>(
-              param1: settings.arguments as AccountListItem));
+              param1: settings.arguments as AccountListItem?));
 
     case Routes.addressBook:
       return MaterialPageRoute<void>(