diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
index 16a00e99d..0fc6ad6fb 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
@@ -166,7 +166,13 @@ module.exports = function(RED) {
                                     if (err) {
                                         reject(err);
                                     } else {
-                                        msg.payload = value;
+                                        if (node.op1type === "date") {
+                                            let d = new Date();
+                                            if (node.op1 == "1") { msg.payload = Date.now(); }
+                                            else if (node.op1 == "iso") { msg.payload = d.toISOString(); }
+                                            else { msg.payload = d; }
+                                        }
+                                        else { msg.payload = value; }
                                         resolve();
                                     }
                                 });
@@ -213,7 +219,12 @@ module.exports = function(RED) {
                                                 }
                                                 else {
                                                     msg2.payload = node.topics[topic].m2;
-                                                    if (node.op2type === "date") { msg2.payload = Date.now(); }
+                                                    if (node.op2type === "date") {
+                                                        let d = new Date();
+                                                        if (node.op2 == "0") { msg2.payload = Date.now(); }
+                                                        else if (node.op2 == "iso") { msg2.payload = d.toISOString(); }
+                                                        else { msg2.payload = d; }
+                                                    }
                                                     if (node.second === true) { msgInfo.send([null,msg2]); }
                                                     else { msgInfo.send(msg2); }
                                                 }