diff --git a/Graphics/Archiver/src/Archiver_GL.cpp b/Graphics/Archiver/src/Archiver_GL.cpp
index c6f2429a2..fba741d0a 100644
--- a/Graphics/Archiver/src/Archiver_GL.cpp
+++ b/Graphics/Archiver/src/Archiver_GL.cpp
@@ -236,7 +236,8 @@ void SerializedShaderImpl::CreateShaderGL(IReferenceCounters*     pRefCounters,
         // TODO: collect all outputs.
         ppCompilerOutput == nullptr || *ppCompilerOutput == nullptr ? ppCompilerOutput : nullptr,
     };
-    CreateShader<CompiledShaderGL>(DeviceType::OpenGL, pRefCounters, ShaderCI, GLShaderCI, m_pDevice->GetRenderDevice(RENDER_DEVICE_TYPE_GL));
+
+    CreateShader<CompiledShaderGL>(DeviceType::OpenGL, pRefCounters, ShaderCI, GLShaderCI, m_pDevice->GetRenderDevice(DeviceType));
 
 #if !DILIGENT_NO_GLSLANG
     if (m_pDevice->GetGLProperties().ValidateShaders)
diff --git a/Graphics/Archiver/src/SerializationDeviceImpl.cpp b/Graphics/Archiver/src/SerializationDeviceImpl.cpp
index e722dc798..6514b9486 100644
--- a/Graphics/Archiver/src/SerializationDeviceImpl.cpp
+++ b/Graphics/Archiver/src/SerializationDeviceImpl.cpp
@@ -43,6 +43,9 @@ static constexpr ARCHIVE_DEVICE_DATA_FLAGS GetSupportedDeviceFlags()
     Flags = Flags | ARCHIVE_DEVICE_DATA_FLAG_GL;
     Flags = Flags | ARCHIVE_DEVICE_DATA_FLAG_GLES;
 #endif
+#if GLES_SUPPORTED
+    Flags = Flags | ARCHIVE_DEVICE_DATA_FLAG_GLES;
+#endif
 #if D3D11_SUPPORTED
     Flags = Flags | ARCHIVE_DEVICE_DATA_FLAG_D3D11;
 #endif