diff --git a/lib/ui/app/history_drawer.dart b/lib/ui/app/history_drawer.dart
index ada1bd6c1..a6f1e7c3f 100644
--- a/lib/ui/app/history_drawer.dart
+++ b/lib/ui/app/history_drawer.dart
@@ -206,7 +206,10 @@ class _HistoryListTileState extends State<HistoryListTile> {
               store.dispatch(ViewReports());
               break;
             case EntityType.settings:
-              store.dispatch(ViewSettings(section: history.id));
+              store.dispatch(ViewSettings(
+                section: history.id,
+                company: state.company,
+              ));
               break;
             default:
               viewEntityById(
diff --git a/lib/ui/app/list_scaffold.dart b/lib/ui/app/list_scaffold.dart
index a9735dfb6..b676ebbc3 100644
--- a/lib/ui/app/list_scaffold.dart
+++ b/lib/ui/app/list_scaffold.dart
@@ -116,6 +116,7 @@ class ListScaffold extends StatelessWidget {
                 TextButton(
                     onPressed: () {
                       store.dispatch(ViewSettings(
+                        company: state.company,
                         section: onCancelSettingsSection,
                         tabIndex: onCancelSettingsIndex,
                       ));
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 21330f4e1..0b799e30a 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -258,7 +258,10 @@ class MainScreen extends StatelessWidget {
               store.dispatch(ViewReports());
               break;
             case EntityType.settings:
-              store.dispatch(ViewSettings(section: history.id));
+              store.dispatch(ViewSettings(
+                section: history.id,
+                company: state.company,
+              ));
               break;
             default:
               viewEntityById(
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index fd7a40e35..2cc670813 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -275,7 +275,9 @@ class MenuDrawer extends StatelessWidget {
                                       const EdgeInsets.only(left: 20),
                                   onTap: () {
                                     store.dispatch(ViewSettings(
-                                        section: kSettingsAccountManagement));
+                                      section: kSettingsAccountManagement,
+                                      company: company,
+                                    ));
                                   },
                                   leading:
                                       Icon(Icons.warning, color: Colors.orange),
@@ -298,7 +300,9 @@ class MenuDrawer extends StatelessWidget {
                                 ),
                                 onTap: () {
                                   store.dispatch(ViewSettings(
-                                      section: kSettingsAccountManagement));
+                                    section: kSettingsAccountManagement,
+                                    company: company,
+                                  ));
                                 },
                               ),
                           DrawerTile(
diff --git a/lib/ui/task/task_screen.dart b/lib/ui/task/task_screen.dart
index ea94e33ec..961004501 100644
--- a/lib/ui/task/task_screen.dart
+++ b/lib/ui/task/task_screen.dart
@@ -73,7 +73,10 @@ class TaskScreen extends StatelessWidget {
             IconButton(
                 icon: Icon(getEntityIcon(EntityType.settings)),
                 onPressed: () {
-                  store.dispatch(ViewSettings(section: kSettingsTaskStatuses));
+                  store.dispatch(ViewSettings(
+                    section: kSettingsTaskStatuses,
+                    company: state.company,
+                  ));
                 })
         ],
         hideListOptions: state.prefState.showKanban,