diff --git a/CyberXeSS/NVNGX_DLSS_Dx11.cpp b/CyberXeSS/NVNGX_DLSS_Dx11.cpp
index c61aeb64..3a9b31e4 100644
--- a/CyberXeSS/NVNGX_DLSS_Dx11.cpp
+++ b/CyberXeSS/NVNGX_DLSS_Dx11.cpp
@@ -326,6 +326,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_EvaluateFeature(ID3D11DeviceConte
 	}
 
 	deviceContext = Dx11Contexts[InFeatureHandle->Id].get();
+	Config::Instance()->CurrentFeature = deviceContext;
 
 	if (deviceContext == nullptr)
 	{
diff --git a/CyberXeSS/NVNGX_DLSS_Dx12.cpp b/CyberXeSS/NVNGX_DLSS_Dx12.cpp
index 90768b95..1fe33a4e 100644
--- a/CyberXeSS/NVNGX_DLSS_Dx12.cpp
+++ b/CyberXeSS/NVNGX_DLSS_Dx12.cpp
@@ -12,7 +12,6 @@
 #include "NVNGX_Parameter.h"
 
 inline ID3D12Device* D3D12Device = nullptr;
-//inline std::unique_ptr<Imgui_Dx12> ImguiDx12 = nullptr;
 static inline ankerl::unordered_dense::map <unsigned int, std::unique_ptr<IFeature_Dx12>> Dx12Contexts;
 inline HWND currentHwnd = nullptr;
 
@@ -361,6 +360,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_EvaluateFeature(ID3D12GraphicsCom
 	}
 
 	deviceContext = Dx12Contexts[InFeatureHandle->Id].get();
+	Config::Instance()->CurrentFeature = deviceContext;
 
 	if (deviceContext == nullptr)
 	{
diff --git a/CyberXeSS/NVNGX_DLSS_Vk.cpp b/CyberXeSS/NVNGX_DLSS_Vk.cpp
index 2a24ce09..38a67eef 100644
--- a/CyberXeSS/NVNGX_DLSS_Vk.cpp
+++ b/CyberXeSS/NVNGX_DLSS_Vk.cpp
@@ -248,6 +248,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_EvaluateFeature(VkCommandBuffer
 		spdlog::warn("NVSDK_NGX_D3D12_EvaluateFeature callback exist");
 
 	const auto deviceContext = VkContexts[InFeatureHandle->Id].get();
+	Config::Instance()->CurrentFeature = deviceContext;
 
 	if (deviceContext->Evaluate(InCmdList, InParameters))
 		return NVSDK_NGX_Result_Success;