diff --git a/src/Nazara/Graphics/Graphics.cpp b/src/Nazara/Graphics/Graphics.cpp
index 1bea6b54d..2ff5d78ca 100644
--- a/src/Nazara/Graphics/Graphics.cpp
+++ b/src/Nazara/Graphics/Graphics.cpp
@@ -19,7 +19,8 @@ namespace Nz
 	ModuleBase("Graphics", this)
 	{
 		Renderer* renderer = Renderer::Instance();
-		std::vector<RenderDeviceInfo> renderDeviceInfo = rendererImpl->QueryRenderDevices();
+
+		const std::vector<RenderDeviceInfo>& renderDeviceInfo = renderer->QueryRenderDevices();
 		if (renderDeviceInfo.empty())
 			throw std::runtime_error("no render device available");
 
@@ -32,6 +33,11 @@ namespace Nz
 				bestRenderDeviceIndex = i;
 				break;
 			}
+			else if (!config.useDedicatedRenderDevice && deviceInfo.type == RenderDeviceType::Integrated)
+			{
+				bestRenderDeviceIndex = i;
+				break;
+			}
 		}
 
 		m_renderDevice = renderer->InstanciateRenderDevice(bestRenderDeviceIndex);