diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index c2f7393d..dede1c3c 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -152,7 +152,8 @@
         on-click-right = "${pkgs.bluez}/bin/bluetoothctl power off";
       };
       "clock#calendar" = {
-        format = "{:󰃭 %Y-%m-%d}";
+        # format = "{:󰃭 %Y-%m-%d}";
+        format = "{:%Y-%m-%d}"; # TEMP, see https://github.com/Alexays/Waybar/issues/3021
         tooltip-format = "<tt><small>{calendar}</small></tt>";
         calendar = {
           mode = "month";
@@ -174,7 +175,10 @@
           on-scroll-down = "shift_down";
         };
       };
-      clock = {format = "{:󰥔 %R}";};
+      clock = {
+        # format = "{:󰥔 %R}";
+        format = "{:%R}"; # TEMP, see https://github.com/Alexays/Waybar/issues/3021
+      };
       backlight = {
         format = "{icon}";
         tooltip-format = "{percent}%";