diff --git a/drivers/SmartThings/zwave-lock/src/init.lua b/drivers/SmartThings/zwave-lock/src/init.lua
index 8b2cf76eb8..6c85639625 100644
--- a/drivers/SmartThings/zwave-lock/src/init.lua
+++ b/drivers/SmartThings/zwave-lock/src/init.lua
@@ -77,7 +77,8 @@ local driver_template = {
   },
   zwave_handlers = {
     [cc.TIME] = {
-      [0x01] = zwave_handlers.time_get_handler -- used by DanaLock
+      [0x01] = zwave_handlers.time_get_handler, -- used by DanaLock
+      [0x03] = zwave_handlers.date_get_handler
     },
     [cc.NOTIFICATION] = {
       [Notification.REPORT] = zwave_handlers.notification_report
diff --git a/drivers/SmartThings/zwave-lock/src/lock_handlers/zwave_responses.lua b/drivers/SmartThings/zwave-lock/src/lock_handlers/zwave_responses.lua
index cfabe41932..7822ab2bfe 100644
--- a/drivers/SmartThings/zwave-lock/src/lock_handlers/zwave_responses.lua
+++ b/drivers/SmartThings/zwave-lock/src/lock_handlers/zwave_responses.lua
@@ -240,4 +240,17 @@ function ZwaveHandlers.time_get_handler(driver, device, cmd)
   )
 end
 
+function ZwaveHandlers.date_get_handler(driver, device, cmd)
+  local Time = (require "st.zwave.CommandClass.Time")({ version = 1 })
+  local time = os.date("*t")
+  device:send_to_component(
+    Time:DateReport({
+      year = time.year,
+      month = time.month,
+      day = time.day
+    }),
+    device:endpoint_to_component(cmd.src_channel)
+  )
+end
+
 return ZwaveHandlers
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua b/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua
index 11c03650c6..d9642851e1 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua
@@ -140,4 +140,25 @@ test.register_coroutine_test(
   }
 )
 
+test.register_coroutine_test(
+  "The driver should respond correctly to a date get",
+  function ()
+    test.socket.zwave:__queue_receive({ mock_device.id, Time:DateGet({},{
+        encap = zw.ENCAP.AUTO,
+        src_channel = 0,
+        dst_channels = {}
+      })
+    })
+    local time = os.date("*t")
+    test.socket.zwave:__expect_send(Time:DateReport({
+      year = time.year,
+      month = time.month,
+      day = time.day
+    }):build_test_tx(mock_device.id))
+  end,
+  {
+     min_api_version = 17
+  }
+)
+
 test.run_registered_tests()