diff --git a/AK/Format.h b/AK/Format.h
index 42e2a67a25..1766e510d1 100644
--- a/AK/Format.h
+++ b/AK/Format.h
@@ -715,6 +715,18 @@ struct Formatter<ErrorOr<T, ErrorType>> : Formatter<FormatString> {
     }
 };
 
+template<typename T>
+struct Formatter<Optional<T>> : Formatter<FormatString> {
+    static constexpr bool is_debug_only() { return true; }
+
+    ErrorOr<void> format(FormatBuilder& builder, Optional<T> const& optional)
+    {
+        if (optional.has_value())
+            return Formatter<FormatString>::format(builder, "Optional({})"sv, *optional);
+        return builder.put_literal("OptionalNone"sv);
+    }
+};
+
 } // namespace AK
 
 #if USING_AK_GLOBALLY
diff --git a/Userland/Libraries/LibTimeZone/TimeZone.h b/Userland/Libraries/LibTimeZone/TimeZone.h
index e813c9d7ad..52e20170f3 100644
--- a/Userland/Libraries/LibTimeZone/TimeZone.h
+++ b/Userland/Libraries/LibTimeZone/TimeZone.h
@@ -9,6 +9,7 @@
 #include <AK/Array.h>
 #include <AK/DeprecatedString.h>
 #include <AK/Error.h>
+#include <AK/Format.h>
 #include <AK/Optional.h>
 #include <AK/StringView.h>
 #include <AK/Time.h>
@@ -74,3 +75,11 @@ StringView region_to_string(Region region);
 Vector<StringView> time_zones_in_region(StringView region);
 
 }
+
+template<>
+struct AK::Formatter<TimeZone::TimeZone> : Formatter<FormatString> {
+    ErrorOr<void> format(FormatBuilder& builder, TimeZone::TimeZone const& time_zone)
+    {
+        return Formatter<FormatString>::format(builder, TimeZone::time_zone_to_string(time_zone));
+    }
+};