diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index aa0f52dba7..e20b01af24 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1787,13 +1787,26 @@ static void *gl_init(const video_info_t *video,
 
    hwr = video_driver_get_hw_context();
 
-   if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
+   if (hwr)
+   {
+      hwr->version_major = gl->version_major;
+      hwr->version_minor = gl->version_minor;
+      hwr->context_type = RETRO_HW_CONTEXT_OPENGL;
+   }
+
+   /* Check if we have a core context */
+   GLint glflags = 0;
+   glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &glflags);
+
+   if (glflags & GL_CONTEXT_CORE_PROFILE_BIT)
    {
       gfx_ctx_flags_t flags;
 
       gl_query_core_context_set(true);
       gl->core_context_in_use = true;
 
+      if (hwr)
+          hwr->context_type = RETRO_HW_CONTEXT_OPENGL_CORE;
       /**
        * Ensure that the rest of the frontend knows we have a core context
        */
@@ -1820,7 +1833,7 @@ static void *gl_init(const video_info_t *video,
    if (gl->renderchain_driver->restore_default_state)
       gl->renderchain_driver->restore_default_state(gl, gl->renderchain_data);
 
-   if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
+   if (hwr && hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
       if (gl->renderchain_driver->new_vao)
          gl->renderchain_driver->new_vao(gl, gl->renderchain_data);
 
@@ -1830,7 +1843,7 @@ static void *gl_init(const video_info_t *video,
    gl->hw_render_use    = false;
    gl->has_fbo          = gl_check_capability(GL_CAPS_FBO);
 
-   if (gl->has_fbo && hwr->context_type != RETRO_HW_CONTEXT_NONE)
+   if (gl->has_fbo && hwr && hwr->context_type != RETRO_HW_CONTEXT_NONE)
       gl->hw_render_use = true;
 
    if (!resolve_extensions(gl, ctx_driver->ident, video))
@@ -1862,7 +1875,7 @@ static void *gl_init(const video_info_t *video,
 
    RARCH_LOG("[GL]: Using resolution %ux%u\n", temp_width, temp_height);
 
-   gl->vertex_ptr        = hwr->bottom_left_origin
+   gl->vertex_ptr        = (hwr && hwr->bottom_left_origin)
       ? vertexes : vertexes_flipped;
 
    /* Better pipelining with GPU due to synchronous glSubTexImage.