diff --git a/ProcessMaker/Http/Controllers/RequestController.php b/ProcessMaker/Http/Controllers/RequestController.php
index ed4d43d82e..52798281da 100644
--- a/ProcessMaker/Http/Controllers/RequestController.php
+++ b/ProcessMaker/Http/Controllers/RequestController.php
@@ -64,12 +64,16 @@ public function index($type = null)
         $userFilter = SaveSession::getConfigFilter('requestFilter', Auth::user());
 
         // Get default Saved search config
-        $defaultSavedSearch = SavedSearch::firstSystemSearchFor(
-            Auth::user(),
-            SavedSearch::KEY_REQUESTS,
-        );
-        if ($defaultSavedSearch) {
-            $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
+        if (class_exists(SavedSearch::class)) {
+            $defaultSavedSearch = SavedSearch::firstSystemSearchFor(
+                Auth::user(),
+                SavedSearch::KEY_REQUESTS,
+            );
+            if ($defaultSavedSearch) {
+                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
+            } else {
+                $defaultColumns = null;
+            }
         } else {
             $defaultColumns = null;
         }
diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php
index ac20276af4..f63fef8987 100644
--- a/ProcessMaker/Http/Controllers/TaskController.php
+++ b/ProcessMaker/Http/Controllers/TaskController.php
@@ -46,12 +46,16 @@ public function index()
         $userFilter = SaveSession::getConfigFilter('taskFilter', Auth::user());
 
         // Get default Saved search config
-        $defaultSavedSearch = SavedSearch::firstSystemSearchFor(
-            Auth::user(),
-            SavedSearch::KEY_TASKS,
-        );
-        if ($defaultSavedSearch) {
-            $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
+        if (class_exists(SavedSearch::class)) {
+            $defaultSavedSearch = SavedSearch::firstSystemSearchFor(
+                Auth::user(),
+                SavedSearch::KEY_TASKS,
+            );
+            if ($defaultSavedSearch) {
+                $defaultColumns = SavedSearchController::adjustColumnsOf($defaultSavedSearch->columns);
+            } else {
+                $defaultColumns = null;
+            }
         } else {
             $defaultColumns = null;
         }
diff --git a/resources/views/requests/index.blade.php b/resources/views/requests/index.blade.php
index 398ccc175e..66d7a5edd4 100644
--- a/resources/views/requests/index.blade.php
+++ b/resources/views/requests/index.blade.php
@@ -90,7 +90,10 @@ function() use ($title) { return [__($title), null]; }
                                     </template>
 
                                     <template v-slot:right-buttons>
-                                        @if(Route::has('package.savedsearch.defaults.edit'))
+                                        @if((
+                                            Auth::user()->is_administrator ||
+                                            Auth::user()->hasPermission('edit-screens')
+                                          ) && Route::has('package.savedsearch.defaults.edit'))
                                         <b-button
                                             class="ml-md-2"
                                             href="{{route(
diff --git a/resources/views/tasks/index.blade.php b/resources/views/tasks/index.blade.php
index c27192eec0..e9b807741e 100644
--- a/resources/views/tasks/index.blade.php
+++ b/resources/views/tasks/index.blade.php
@@ -65,7 +65,10 @@
                       </template>
 
                       <template v-slot:right-buttons>
-                          @if(Route::has('package.savedsearch.defaults.edit'))
+                          @if((
+                              Auth::user()->is_administrator ||
+                              Auth::user()->hasPermission('edit-screens')
+                            ) && Route::has('package.savedsearch.defaults.edit'))
                           <b-button
                             class="ml-md-2"
                             href="{{route(