diff --git a/grafana-plugin/src/pages/schedule/Schedule.tsx b/grafana-plugin/src/pages/schedule/Schedule.tsx
index ce502c70..d5364c62 100644
--- a/grafana-plugin/src/pages/schedule/Schedule.tsx
+++ b/grafana-plugin/src/pages/schedule/Schedule.tsx
@@ -241,9 +241,9 @@ class SchedulePage extends React.Component<SchedulePageProps, SchedulePageState>
                 </div>
               </VerticalGroup>
             </div>
-            {showEditForm && (
+            {showEditForm && schedule && (
               <ScheduleForm
-                id={schedule.id}
+                id={scheduleId}
                 onUpdate={this.update}
                 onHide={() => {
                   this.setState({ showEditForm: false });