diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
index 145e659574a..c8f8d62588a 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
@@ -138,7 +138,7 @@ export const SharePublicDashboard = (props: Props) => {
                 <br />
                 <div style={{ padding: '5px' }}>
                   <Input
-                    value={props.dashboard.time.from}
+                    value={props.dashboard.getDefaultTime().from}
                     disabled={true}
                     addonBefore={
                       <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>
@@ -147,7 +147,7 @@ export const SharePublicDashboard = (props: Props) => {
                     }
                   />
                   <Input
-                    value={props.dashboard.time.to}
+                    value={props.dashboard.getDefaultTime().to}
                     disabled={true}
                     addonBefore={
                       <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>To:</span>
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index 13b1a51d5f4..2bd035411c1 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -1108,6 +1108,10 @@ export class DashboardModel implements TimeModel {
     }
   }
 
+  getDefaultTime() {
+    return this.originalTime;
+  }
+
   private getPanelRepeatVariable(panel: PanelModel) {
     return this.getVariablesFromState(this.uid).find((variable) => variable.name === panel.repeat);
   }