diff --git a/OptiScaler/hooks/DxgiFactory_Hooks.cpp b/OptiScaler/hooks/DxgiFactory_Hooks.cpp
index bf9d444f..1adc7342 100644
--- a/OptiScaler/hooks/DxgiFactory_Hooks.cpp
+++ b/OptiScaler/hooks/DxgiFactory_Hooks.cpp
@@ -426,10 +426,10 @@ HRESULT DxgiFactoryHooks::CreateSwapChainForHwnd(IDXGIFactory2* realFactory, IUn
     if (pFullscreenDesc != nullptr)
         State::Instance().realExclusiveFullscreen = !pFullscreenDesc->Windowed;
 
-    if (pFullscreenDesc != nullptr && State::Instance().activeFgOutput == FGOutput::XeFG &&
+    if (State::Instance().activeFgOutput == FGOutput::XeFG &&
         Config::Instance()->FGXeFGForceBorderless.value_or_default())
     {
-        if (!pFullscreenDesc->Windowed)
+        if (pFullscreenDesc != nullptr && !pFullscreenDesc->Windowed)
         {
             State::Instance().SCExclusiveFullscreen = true;
             pFullscreenDesc->Windowed = true;
diff --git a/OptiScaler/hooks/DxgiFactory_WrappedCalls.cpp b/OptiScaler/hooks/DxgiFactory_WrappedCalls.cpp
index 292f3402..278dfe45 100644
--- a/OptiScaler/hooks/DxgiFactory_WrappedCalls.cpp
+++ b/OptiScaler/hooks/DxgiFactory_WrappedCalls.cpp
@@ -296,10 +296,10 @@ HRESULT DxgiFactoryWrappedCalls::CreateSwapChainForHwnd(IDXGIFactory2* realFacto
     if (pFullscreenDesc != nullptr)
         State::Instance().realExclusiveFullscreen = !pFullscreenDesc->Windowed;
 
-    if (pFullscreenDesc != nullptr && State::Instance().activeFgOutput == FGOutput::XeFG &&
+    if (State::Instance().activeFgOutput == FGOutput::XeFG &&
         Config::Instance()->FGXeFGForceBorderless.value_or_default())
     {
-        if (!pFullscreenDesc->Windowed)
+        if (pFullscreenDesc != nullptr && !pFullscreenDesc->Windowed)
         {
             State::Instance().SCExclusiveFullscreen = true;
             pFullscreenDesc->Windowed = true;