diff --git a/Components/9918/Implementation/Storage.hpp b/Components/9918/Implementation/Storage.hpp
index f0a0611b3..70a4bcd92 100644
--- a/Components/9918/Implementation/Storage.hpp
+++ b/Components/9918/Implementation/Storage.hpp
@@ -86,7 +86,8 @@ struct YamahaFetcher {
 			std::array<Event, size> result{};
 			size_t index = 0;
 			for(int c = 0; c < 1368; c++) {
-				const auto event = GeneratorT::event(c);
+				// Specific personality doesn't matter here; both Yamahas use the same internal timing.
+				const auto event = GeneratorT::event(from_internal<Personality::V9938, Clock::Grauw>(c));
 				if(!event) {
 					continue;
 				}