diff --git a/src/openrct2-ui/input/ShortcutManager.cpp b/src/openrct2-ui/input/ShortcutManager.cpp
index d729ea8b30..7934d3d7f0 100644
--- a/src/openrct2-ui/input/ShortcutManager.cpp
+++ b/src/openrct2-ui/input/ShortcutManager.cpp
@@ -234,7 +234,7 @@ std::optional<ShortcutInput> ShortcutManager::ConvertLegacyBinding(uint16_t bind
 
     if (binding == nullBinding)
     {
-        return {};
+        return std::nullopt;
     }
     else
     {
diff --git a/src/openrct2-ui/scripting/ScTitleSequence.hpp b/src/openrct2-ui/scripting/ScTitleSequence.hpp
index 5b158d176b..5c53bd8c67 100644
--- a/src/openrct2-ui/scripting/ScTitleSequence.hpp
+++ b/src/openrct2-ui/scripting/ScTitleSequence.hpp
@@ -248,7 +248,7 @@ namespace OpenRCT2::Scripting
                     return i;
                 }
             }
-            return {};
+            return std::nullopt;
         }
     };
 
@@ -489,7 +489,7 @@ namespace OpenRCT2::Scripting
                     return i;
                 }
             }
-            return {};
+            return std::nullopt;
         }
 
         const TitleSequenceManagerItem* GetItem() const
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index b9358cd04e..9b877ca0dc 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -1556,12 +1556,12 @@ static std::optional<StationIndex> GetStationIndexFromViewSelection(const rct_wi
 {
     const auto* ride = get_ride(static_cast<ride_id_t>(w.number));
     if (ride == nullptr)
-        return {};
+        return std::nullopt;
 
     int32_t viewSelectionIndex = w.ride.view - 1 - ride->num_vehicles;
     if (viewSelectionIndex < 0)
     {
-        return {};
+        return std::nullopt;
     }
 
     for (StationIndex index = 0; index < sizeof(ride->stations); ++index)
@@ -1575,7 +1575,7 @@ static std::optional<StationIndex> GetStationIndexFromViewSelection(const rct_wi
             }
         }
     }
-    return {};
+    return std::nullopt;
 }
 
 /**