diff --git a/Editor/EditorActiveProfileChangeHandler.cs b/Editor/EditorActiveProfileChangeHandler.cs
index 5d20e9e4f..5eea8007d 100644
--- a/Editor/EditorActiveProfileChangeHandler.cs
+++ b/Editor/EditorActiveProfileChangeHandler.cs
@@ -3,7 +3,6 @@
 
 using UnityEditor;
 using UnityEngine;
-using XRTK.Extensions;
 using XRTK.Services;
 
 namespace XRTK.Editor
@@ -18,7 +17,7 @@ static EditorActiveProfileChangeHandler()
 
         private static void EditorApplication_hierarchyChanged()
         {
-            if (!(MixedRealityToolkit.Instance.IsNull() || MixedRealityToolkit.Instance.ActiveProfile.IsNull()))
+            if (MixedRealityToolkit.HasActiveProfile)
             {
                 if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
                     Utilities.InputMappingAxisUtility.CheckUnityInputManagerMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes))