diff --git a/CockpitSpace/RestartSimulation.js b/CockpitSpace/RestartSimulation.js
index 15fbf7fa8..4d5787271 100644
--- a/CockpitSpace/RestartSimulation.js
+++ b/CockpitSpace/RestartSimulation.js
@@ -103,17 +103,20 @@ function newRestartSimulation () {
     }
 
     let simulationParams = {
-      beginDatetime: dateAtScreenCorner.valueOf() / 1000 | 0,
+      beginDatetime: dateAtScreenCorner.valueOf(),
       resumeExecution: false,
       timePeriodDailyArray: timePeriodDailyArray,
-      timePeriodMarketArray: timePeriodMarketArray
+      timePeriodMarketArray: timePeriodMarketArray,
+      timestamp: (new Date()).valueOf()
     }
     try {
       thisObject.status = 'Saving'
-      let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer()
+      let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(simulationParams)
       if (result === true) {
-        thisObject.status = 'Restarting'
-        await graphQlRestartSimulation(simulationParams)
+        if (window.canvasApp.executingAt !== 'Local') {
+          thisObject.status = 'Restarting'
+          await graphQlRestartSimulation(simulationParams)
+        }
         thisObject.status = 'Calculating'
         counterTillNextState = 50
       } else {
diff --git a/StrategySpace/StrategizerGateway.js b/StrategySpace/StrategizerGateway.js
index fa7fbfcad..431129be8 100644
--- a/StrategySpace/StrategizerGateway.js
+++ b/StrategySpace/StrategizerGateway.js
@@ -94,7 +94,7 @@ function newStrategizerGateway () {
     }
   }
 
-  async function saveToStrategyzer () {
+  async function saveToStrategyzer (simulationParams) {
     try {
       const accessToken = window.localStorage.getItem(LOGGED_IN_ACCESS_TOKEN_LOCAL_STORAGE_KEY)
       if (accessToken === null) {
@@ -121,6 +121,7 @@ function newStrategizerGateway () {
       }
 
       if (window.canvasApp.executingAt === 'Local') {
+        tradingSystem.simulationParams = simulationParams
         callServer(JSON.stringify(tradingSystem), 'SaveDefinition', onSaved)
         function onSaved (err) {
           if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) {