diff --git a/lib/data/models/user_model.dart b/lib/data/models/user_model.dart
index 3eba576b7..ed72abe2c 100644
--- a/lib/data/models/user_model.dart
+++ b/lib/data/models/user_model.dart
@@ -133,7 +133,6 @@ abstract class UserEntity extends Object
       customValue2: '',
       customValue3: '',
       customValue4: '',
-      userCompany: userCompany,
       oauthProvider: '',
       isTwoFactorEnabled: false,
       hasPassword: false,
@@ -141,6 +140,7 @@ abstract class UserEntity extends Object
       oauthUserToken: '',
       password: '',
       phoneVerified: false,
+      userCompany: userCompany ?? UserCompanyEntity(false),
     );
   }
 
@@ -332,6 +332,7 @@ abstract class UserEntity extends Object
 
   // ignore: unused_element
   static void _initializeBuilder(UserEntityBuilder builder) => builder
+    ..userCompany.replace(UserCompanyEntity(false))
     ..isTwoFactorEnabled = false
     ..hasPassword = false
     ..phoneVerified = false
diff --git a/lib/redux/client/client_selectors.dart b/lib/redux/client/client_selectors.dart
index d2db02af6..5405bac90 100644
--- a/lib/redux/client/client_selectors.dart
+++ b/lib/redux/client/client_selectors.dart
@@ -147,10 +147,6 @@ SettingsEntity getClientSettings(AppState? state, ClientEntity? client) {
 }
 
 SettingsEntity getVendorSettings(AppState state, VendorEntity? vendor) {
-  if (state == null) {
-    return SettingsEntity();
-  }
-
   vendor ??= VendorEntity();
   final company = state.company!;
   //final group = state.groupState.get(vendor.groupId);
diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart
index 38e2a9973..9be10d232 100644
--- a/lib/redux/company/company_reducer.dart
+++ b/lib/redux/company/company_reducer.dart
@@ -194,16 +194,6 @@ UserCompanyEntity loadCompanySuccessReducer(
     UserCompanyEntity? company, LoadCompanySuccess action) {
   var userCompany = action.userCompany;
 
-  // Check user has a blank user settings object
-  if (userCompany.settings == null) {
-    userCompany = userCompany.rebuild((b) => b
-      ..settings.replace(UserSettingsEntity())
-      ..user
-          .userCompany
-          .notifications
-          .replace(BuiltMap<String, BuiltList<String>>()));
-  }
-
   userCompany = userCompany.rebuild((b) => b.company
     ..taskStatuses.replace(<TaskStatusEntity>[])
     ..taskStatusMap.replace(BuiltMap<String, TaskStatusEntity>())
diff --git a/lib/ui/app/entities/entity_actions_dialog.dart b/lib/ui/app/entities/entity_actions_dialog.dart
index 4bc6051fd..34c144b67 100644
--- a/lib/ui/app/entities/entity_actions_dialog.dart
+++ b/lib/ui/app/entities/entity_actions_dialog.dart
@@ -45,9 +45,6 @@ Future<void> showEntityActionsDialog(
     {required List<BaseEntity?> entities,
     Completer? completer,
     bool multiselect = false}) async {
-  if (entities == null) {
-    return;
-  }
   final mainContext = navigatorKey.currentContext;
   final state = StoreProvider.of<AppState>(navigatorKey.currentContext!).state;
   final actions = <Widget>[];
diff --git a/lib/ui/app/entities/entity_status_chip.dart b/lib/ui/app/entities/entity_status_chip.dart
index 4e30afc41..d48a13a13 100644
--- a/lib/ui/app/entities/entity_status_chip.dart
+++ b/lib/ui/app/entities/entity_status_chip.dart
@@ -125,7 +125,6 @@ class EntityStatusChip extends StatelessWidget {
           break;
         default:
           return SizedBox();
-          break;
       }
 
       label = localization!.lookup(label) ?? '';
diff --git a/lib/ui/app/invoice/invoice_item_view.dart b/lib/ui/app/invoice/invoice_item_view.dart
index 7882a3e10..f67e26b1b 100644
--- a/lib/ui/app/invoice/invoice_item_view.dart
+++ b/lib/ui/app/invoice/invoice_item_view.dart
@@ -154,7 +154,7 @@ class InvoiceItemListTile extends StatelessWidget {
                   SizedBox(width: 1),
                 ],
               ),
-              trailing: onTap != null ? Icon(Icons.navigate_next) : null,
+              trailing: Icon(Icons.navigate_next),
             ),
             ListDivider(),
           ],
diff --git a/lib/ui/app/tables/app_paginated_data_table.dart b/lib/ui/app/tables/app_paginated_data_table.dart
index 3d4e2c7b9..fd5fe8065 100644
--- a/lib/ui/app/tables/app_paginated_data_table.dart
+++ b/lib/ui/app/tables/app_paginated_data_table.dart
@@ -296,7 +296,7 @@ class AppPaginatedDataTableState extends State<AppPaginatedDataTable> {
       DataRow? row;
       if (index < _rowCount || _rowCountApproximate) {
         row = _rows.putIfAbsent(index, () => widget.source.getRow(index));
-        if (row == null && !haveProgressIndicator) {
+        if (!haveProgressIndicator) {
           row = _getProgressIndicatorRowFor(index);
           haveProgressIndicator = true;
         }
diff --git a/lib/ui/app/tables/entity_datatable.dart b/lib/ui/app/tables/entity_datatable.dart
index 6d23d5a5e..181cbdd76 100644
--- a/lib/ui/app/tables/entity_datatable.dart
+++ b/lib/ui/app/tables/entity_datatable.dart
@@ -60,17 +60,6 @@ class EntityDataTableSource extends AppDataTableSource {
     final listState = state.getListState(entityType);
     final uIState = state.getUIState(entityType);
 
-    if (entity == null) {
-      return DataRow(cells: [
-        DataCell(SizedBox()),
-        ...tableColumns!.map(
-          (field) => DataCell(
-            SizedBox(),
-          ),
-        )
-      ]);
-    }
-
     bool isSelected = false;
     if (!listState.isInMultiselect() &&
         (state.prefState.isPreviewVisible || state.uiState.isEditing)) {
diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart
index bfb10e8d8..e051a264a 100644
--- a/lib/ui/dashboard/dashboard_panels.dart
+++ b/lib/ui/dashboard/dashboard_panels.dart
@@ -753,8 +753,6 @@ class DashboardPanels extends StatelessWidget {
                 case DashboardSections.runningTasks:
                   return runningTasks!;
               }
-
-              return SizedBox();
             },
           ),
         ),
diff --git a/lib/ui/dashboard/dashboard_screen_vm.dart b/lib/ui/dashboard/dashboard_screen_vm.dart
index e8da692f8..2873d0434 100644
--- a/lib/ui/dashboard/dashboard_screen_vm.dart
+++ b/lib/ui/dashboard/dashboard_screen_vm.dart
@@ -95,9 +95,6 @@ class DashboardVM {
       isLoading: state.isLoading,
       onRefreshed: (context) => _handleRefresh(context),
       onEntityTypeChanged: (entityType) {
-        if (entityType == null) {
-          return;
-        }
         store.dispatch(UpdateDashboardEntityType(entityType: entityType));
       },
       onSettingsChanged: (DashboardSettings settings) =>
diff --git a/lib/ui/expense/expense_list_item.dart b/lib/ui/expense/expense_list_item.dart
index 1a76658c2..e54f0d61e 100644
--- a/lib/ui/expense/expense_list_item.dart
+++ b/lib/ui/expense/expense_list_item.dart
@@ -61,7 +61,7 @@ class ExpenseListItem extends StatelessWidget {
     String subtitle = '';
     if (filterMatch != null) {
       subtitle = filterMatch;
-    } else if (client != null || vendor != null || category != null) {
+    } else {
       final parts = <String>[
         formatDate(expense.date, context),
       ];