diff --git a/src/BizHawk.Client.Common/Api/Classes/UserDataApi.cs b/src/BizHawk.Client.Common/Api/Classes/UserDataApi.cs
index a2bf2a5863..03f9e2ba71 100644
--- a/src/BizHawk.Client.Common/Api/Classes/UserDataApi.cs
+++ b/src/BizHawk.Client.Common/Api/Classes/UserDataApi.cs
@@ -18,7 +18,11 @@ namespace BizHawk.Client.Common
 			get
 			{
 				ICollection<string> keys = _movieSession.UserBag.Keys;
+#if NET5_0_OR_GREATER
+				return (keys as KeyCollectionType) ?? keys.ToHashSet();
+#else
 				return (keys as KeyCollectionType) ?? keys.ToList();
+#endif
 			}
 		}