diff --git a/src/openrct2/localisation/Formatter.h b/src/openrct2/localisation/Formatter.h
index 1a9e35bcb5..bc67042eaf 100644
--- a/src/openrct2/localisation/Formatter.h
+++ b/src/openrct2/localisation/Formatter.h
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "../Identifiers.h"
 #include "../common.h"
 #include "../core/Guard.hpp"
 #include "../core/String.hpp"
@@ -17,7 +18,6 @@
 #include <cstring>
 
 extern thread_local uint8_t gCommonFormatArgs[80];
-enum class RideId : uint16_t;
 
 class Formatter
 {
@@ -85,23 +85,27 @@ public:
 
         // clang-format off
         static_assert(
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, char*> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, const char*> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, int16_t> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, int32_t> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, money32> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, money64> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, RideId> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, rct_string_id> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, uint16_t> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, uint32_t> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, utf8*> ||
-            std::is_same_v<typename std::remove_cv<TSpecified>::type, const utf8*>
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, char*> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, const char*> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, int16_t> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, int32_t> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, money32> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, money64> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, RideId> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, rct_string_id> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, uint16_t> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, uint32_t> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, utf8*> ||
+            std::is_same_v<typename std::remove_cv_t<TSpecified>, const utf8*>
         );
         // clang-format on
 
         uint64_t convertedValue;
-        if constexpr (std::is_integral_v<TSpecified> || std::is_enum_v<TSpecified>)
+        if constexpr (std::is_same_v<std::remove_cv_t<TDeduced>, RideId>)
+        {
+            convertedValue = static_cast<uint64_t>(value.ToUnderlying());
+        }
+        else if constexpr (std::is_integral_v<TSpecified> || std::is_enum_v<TSpecified>)
         {
             convertedValue = static_cast<uint64_t>(value);
         }