diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx
index 230d2c84..9493d837 100644
--- a/grafana-plugin/src/pages/schedules/Schedules.tsx
+++ b/grafana-plugin/src/pages/schedules/Schedules.tsx
@@ -85,7 +85,13 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
       query: { id },
     } = this.props;
 
-    if (id) {
+    if (!id) {return;}
+
+    const isNewSchedule = id === 'new';
+    let scheduleId = undefined;
+
+    if (!isNewSchedule) {
+      // load schedule only for valid id
       const schedule = await store.scheduleStore
         .loadItem(id, true)
         .catch((error) => this.setState({ errorData: { ...getWrongTeamResponseInfo(error) } }));
@@ -94,12 +100,13 @@ class SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSta
       }
 
       const schedules = store.scheduleStore.getSearchResult();
-      const scheduleId = schedules && schedules.find((res) => res.id === id)?.id;
-      if (scheduleId || id === 'new') {
-        this.setState({ scheduleIdToEdit: id });
-      } else {
-        openErrorNotification(`Schedule with id=${id} is not found. Please select schedule from the list.`);
-      }
+      scheduleId = schedules && schedules.find((res) => res.id === id)?.id;
+    }
+
+    if (scheduleId || isNewSchedule) {
+      this.setState({ scheduleIdToEdit: id });
+    } else {
+      openErrorNotification(`Schedule with id=${id} is not found. Please select schedule from the list.`);
     }
   };