diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/ApplyMaskDateEnvironmentTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/ApplyMaskDateEnvironmentTest.php
index acb7877e7..14282e5c8 100644
--- a/tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/ApplyMaskDateEnvironmentTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/Util/Helpers/ApplyMaskDateEnvironmentTest.php
@@ -17,4 +17,16 @@ class ApplyMaskDateEnvironmentTest extends TestCase
         $expected = '2020/11/12';
         $this->assertEquals($expected, applyMaskDateEnvironment($date1, 'Y/m/d'));
     }
+
+    /**
+     * When the mask is empty will return the same date
+     *
+     * @test
+     */
+    public function it_should_return_date_without_mask()
+    {
+        $date1 = date("2020-11-12 09:09:10");
+        $expected = '2020-11-12 09:09:10';
+        $this->assertEquals($expected, applyMaskDateEnvironment($date1));
+    }
 }
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Util/helpers.php b/workflow/engine/src/ProcessMaker/Util/helpers.php
index 8131b9837..c94418eb6 100644
--- a/workflow/engine/src/ProcessMaker/Util/helpers.php
+++ b/workflow/engine/src/ProcessMaker/Util/helpers.php
@@ -617,7 +617,7 @@ function applyMaskDateEnvironment(string $date, $mask = '')
         $systemConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
         $mask = isset($systemConf->aConfig['dateFormat']) ? $systemConf->aConfig['dateFormat'] : '';
     }
-    if (!empty($date)) {
+    if (!empty($date) && !empty($mask)) {
         $date = new DateTime($date);
         $result = $date->format($mask);
     } else {