diff --git a/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs b/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs
index bb9dad972..cf4d12692 100644
--- a/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs
+++ b/targets/unity-v2/source/ExampleTestProject/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels/PlayFabEditorSettings.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEngine;
 
 namespace PlayFab.PfEditor
@@ -43,7 +44,23 @@ private static void DrawApiSubPanel()
         {
             using (new UnityVertical(PlayFabEditorHelper.uiStyle.GetStyle("gpStyleGray1")))
             {
-                var curDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+#if UNITY_2021_2_OR_NEWER
+#if UNITY_SERVER
+                NamedBuildTarget buildTarget = NamedBuildTarget.Server;
+#else
+                BuildTarget activeBuildTarget = EditorUserBuildSettings.activeBuildTarget;
+                BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(activeBuildTarget);
+                NamedBuildTarget buildTarget = NamedBuildTarget.FromBuildTargetGroup(targetGroup);
+#endif
+#else
+                BuildTargetGroup buildTarget = EditorUserBuildSettings.selectedBuildTargetGroup;
+#endif
+                
+#if UNITY_2021_2_OR_NEWER
+                var curDefines = PlayerSettings.GetScriptingDefineSymbols(buildTarget);
+#else
+                var curDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTarget);
+#endif
                 var changedFlags = false;
                 var allFlags = new Dictionary<string, PfDefineFlag>(PlayFabEditorHelper.FLAG_LABELS);
                 var extraDefines = new HashSet<string>(curDefines.Split(' ', ';'));
@@ -69,7 +86,12 @@ private static void DrawApiSubPanel()
 
                 if (changedFlags)
                 {
-                    PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, curDefines);
+#if UNITY_2021_2_OR_NEWER
+                    PlayerSettings.SetScriptingDefineSymbols(buildTarget, curDefines);
+#else
+                    PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTarget, curDefines);
+#endif
+                    
                     Debug.Log("Updating Defines: " + curDefines);
                     AssetDatabase.Refresh();
                 }