diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf3161d61..68a3a6f9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Fixed
 * Fixes an exception thrown when trying to access the `/nests/:id/eggs/:id` API endpoint.
 * Fixes search on server listing page.
+* Schedules with no names are now clickable to allow editing.
 
 ### Added
 * Adds ability to include egg variables on an API request.
diff --git a/app/Http/Requests/Server/ScheduleCreationFormRequest.php b/app/Http/Requests/Server/ScheduleCreationFormRequest.php
index 2be18434f..a90dd749a 100644
--- a/app/Http/Requests/Server/ScheduleCreationFormRequest.php
+++ b/app/Http/Requests/Server/ScheduleCreationFormRequest.php
@@ -33,7 +33,7 @@ class ScheduleCreationFormRequest extends ServerFormRequest
     public function rules()
     {
         return [
-            'name' => 'string|max:255',
+            'name' => 'nullable|string|max:255',
             'cron_day_of_week' => 'required|string',
             'cron_day_of_month' => 'required|string',
             'cron_hour' => 'required|string',
diff --git a/resources/themes/pterodactyl/server/schedules/index.blade.php b/resources/themes/pterodactyl/server/schedules/index.blade.php
index b51ee089c..aefcef5de 100644
--- a/resources/themes/pterodactyl/server/schedules/index.blade.php
+++ b/resources/themes/pterodactyl/server/schedules/index.blade.php
@@ -43,7 +43,9 @@
                             <tr @if(! $schedule->is_active)class="muted muted-hover"@endif>
                                 <td class="middle">
                                     @can('edit-schedule', $server)
-                                        <a href="{{ route('server.schedules.view', ['server' => $server->uuidShort, '$schedule' => $schedule->hashid]) }}">{{ $schedule->name }}</a>
+                                        <a href="{{ route('server.schedules.view', ['server' => $server->uuidShort, '$schedule' => $schedule->hashid]) }}">
+                                            {{ $schedule->name ?? trans('server.schedule.unnamed') }}
+                                        </a>
                                     @else
                                         {{ $schedule->name ?? trans('server.schedule.unnamed') }}
                                     @endcan