diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 6f75c9ea4..cf9f1a5a9 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -673,12 +673,12 @@ abstract class TaskEntity extends Object
             ? -1
             : taskA.isInvoiced
                 ? 999999
-                : taskStatusMap[taskA.statusId].statusOrder;
+                : (taskStatusMap[taskA.statusId]?.statusOrder ?? 0);
         final taskBStatus = taskB.isRunning
             ? -1
             : taskB.isInvoiced
                 ? 999999
-                : taskStatusMap[taskB.statusId].statusOrder;
+                : (taskStatusMap[taskB.statusId]?.statusOrder ?? 0);
         response = taskAStatus.compareTo(taskBStatus);
         break;
       default:
diff --git a/lib/ui/app/edit_scaffold.dart b/lib/ui/app/edit_scaffold.dart
index 2955b08c9..b8e3ea474 100644
--- a/lib/ui/app/edit_scaffold.dart
+++ b/lib/ui/app/edit_scaffold.dart
@@ -76,7 +76,7 @@ class EditScaffold extends StatelessWidget {
     if (!state.isProPlan || state.account.isTrial) {
       if (kAdvancedSettings.contains(state.uiState.baseSubRoute)) {
         showUpgradeBanner = true;
-        if (!state.isProPlan && isEnabled) {
+        if (!state.isProPlan && !state.account.isTrial && isEnabled) {
           isCancelEnabled = true;
           isEnabled = false;
         }