diff --git a/daemon/x52d_clock.c b/daemon/x52d_clock.c
index 18157c4..55f8935 100644
--- a/daemon/x52d_clock.c
+++ b/daemon/x52d_clock.c
@@ -111,9 +111,11 @@ cleanup:
 
 static void set_clock_offset(libx52_clock_id id, const char *param)
 {
-    PINELOG_DEBUG(_("Setting %s clock timezone to %s"),
-                  libx52_clock_id_to_str(id), param);
-    x52d_dev_set_clock_timezone(id, get_tz_offset(param));
+    if (clock_enabled) {
+        PINELOG_DEBUG(_("Setting %s clock timezone to %s"),
+                      libx52_clock_id_to_str(id), param);
+        x52d_dev_set_clock_timezone(id, get_tz_offset(param));
+    }
 }
 
 void x52d_cfg_set_Clock_Secondary(char* param)
@@ -128,9 +130,11 @@ void x52d_cfg_set_Clock_Tertiary(char* param)
 
 static void set_clock_format(libx52_clock_id id, libx52_clock_format fmt)
 {
-    PINELOG_DEBUG(_("Setting %s clock format to %s"),
-                  libx52_clock_id_to_str(id), libx52_clock_format_to_str(fmt));
-    x52d_dev_set_clock_format(id, fmt);
+    if (clock_enabled) {
+        PINELOG_DEBUG(_("Setting %s clock format to %s"),
+                      libx52_clock_id_to_str(id), libx52_clock_format_to_str(fmt));
+        x52d_dev_set_clock_format(id, fmt);
+    }
 }
 
 void x52d_cfg_set_Clock_FormatPrimary(libx52_clock_format fmt)
@@ -150,8 +154,10 @@ void x52d_cfg_set_Clock_FormatTertiary(libx52_clock_format fmt)
 
 void x52d_cfg_set_Clock_DateFormat(libx52_date_format fmt)
 {
-    PINELOG_DEBUG(_("Setting date format to %s"), libx52_date_format_to_str(fmt));
-    x52d_dev_set_date_format(fmt);
+    if (clock_enabled) {
+        PINELOG_DEBUG(_("Setting date format to %s"), libx52_date_format_to_str(fmt));
+        x52d_dev_set_date_format(fmt);
+    }
 }
 
 static pthread_t clock_thr;
diff --git a/po/x52pro-linux.pot b/po/x52pro-linux.pot
index 1014b4f..58ba776 100644
--- a/po/x52pro-linux.pot
+++ b/po/x52pro-linux.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: x52pro-linux 0.2.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
-"POT-Creation-Date: 2021-08-30 11:52-0700\n"
+"POT-Creation-Date: 2021-08-30 11:59-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -574,7 +574,7 @@ msgstr ""
 msgid "Setting clock enable to %s"
 msgstr ""
 
-#: daemon/x52d_clock.c:34 daemon/x52d_clock.c:114
+#: daemon/x52d_clock.c:34 daemon/x52d_clock.c:115
 #, c-format
 msgid "Setting %s clock timezone to %s"
 msgstr ""
@@ -595,31 +595,31 @@ msgstr ""
 msgid "Unable to backup timezone environment. Falling back to UTC"
 msgstr ""
 
-#: daemon/x52d_clock.c:131
+#: daemon/x52d_clock.c:134
 #, c-format
 msgid "Setting %s clock format to %s"
 msgstr ""
 
-#: daemon/x52d_clock.c:153
+#: daemon/x52d_clock.c:158
 #, c-format
 msgid "Setting date format to %s"
 msgstr ""
 
-#: daemon/x52d_clock.c:163
+#: daemon/x52d_clock.c:169
 msgid "Starting X52 clock manager thread"
 msgstr ""
 
-#: daemon/x52d_clock.c:174
+#: daemon/x52d_clock.c:180
 #, c-format
 msgid "Error %d retrieving current time: %s"
 msgstr ""
 
-#: daemon/x52d_clock.c:195
+#: daemon/x52d_clock.c:201
 #, c-format
 msgid "Error %d initializing clock thread: %s"
 msgstr ""
 
-#: daemon/x52d_clock.c:202
+#: daemon/x52d_clock.c:208
 msgid "Shutting down X52 clock manager thread"
 msgstr ""
 
diff --git a/po/xx_PL.po b/po/xx_PL.po
index 35cf8f6..804ded0 100644
--- a/po/xx_PL.po
+++ b/po/xx_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: x52pro-linux 0.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
-"POT-Creation-Date: 2021-08-30 11:52-0700\n"
+"POT-Creation-Date: 2021-08-30 11:59-0700\n"
 "PO-Revision-Date: 2021-08-30 10:41-0700\n"
 "Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n"
 "Language-Team: Dummy Language for testing i18n\n"
@@ -620,7 +620,7 @@ msgstr "Uttingshay ownday X52 aemonday"
 msgid "Setting clock enable to %s"
 msgstr "Ettingsay ockclay enableay otay %s"
 
-#: daemon/x52d_clock.c:34 daemon/x52d_clock.c:114
+#: daemon/x52d_clock.c:34 daemon/x52d_clock.c:115
 #, c-format
 msgid "Setting %s clock timezone to %s"
 msgstr "Ettingsay %s ockclay imezonetay otay %s"
@@ -644,31 +644,31 @@ msgid "Unable to backup timezone environment. Falling back to UTC"
 msgstr ""
 "Unableay otay ackupbay imezonetay environmentay. Allingfay ackbay otay UTCay"
 
-#: daemon/x52d_clock.c:131
+#: daemon/x52d_clock.c:134
 #, c-format
 msgid "Setting %s clock format to %s"
 msgstr "Ettingsay %s ockclay ormatfay otay %s"
 
-#: daemon/x52d_clock.c:153
+#: daemon/x52d_clock.c:158
 #, c-format
 msgid "Setting date format to %s"
 msgstr "Ettingsay ateday ormatfay otay %s"
 
-#: daemon/x52d_clock.c:163
+#: daemon/x52d_clock.c:169
 msgid "Starting X52 clock manager thread"
 msgstr "Artingstay X52 ockclay anagermay eadthray"
 
-#: daemon/x52d_clock.c:174
+#: daemon/x52d_clock.c:180
 #, c-format
 msgid "Error %d retrieving current time: %s"
 msgstr "Erroray %d etrievingray urrentcay imetay: %s"
 
-#: daemon/x52d_clock.c:195
+#: daemon/x52d_clock.c:201
 #, c-format
 msgid "Error %d initializing clock thread: %s"
 msgstr "Erroray %d initializingay ockclay eadthray: %s"
 
-#: daemon/x52d_clock.c:202
+#: daemon/x52d_clock.c:208
 msgid "Shutting down X52 clock manager thread"
 msgstr "Uttingshay ownday X52 ockclay anagermay eadthray"