diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index 01e835068a..ae61ccb819 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -289,7 +289,10 @@ static void free_drm_resources(gfx_ctx_drm_data_t *drm)
 
    if (drm->drm)
       if (g_drm_fd >= 0)
+      {
+         drmDropMaster(g_drm_fd);
          filestream_close(drm->drm);
+      }
 
    g_gbm_surface      = NULL;
    g_gbm_dev          = NULL;
@@ -381,6 +384,8 @@ nextgpu:
    drm->fb_width    = g_drm_connector->modes[0].hdisplay;
    drm->fb_height   = g_drm_connector->modes[0].vdisplay;
 
+   drmSetMaster(g_drm_fd);
+
    g_gbm_dev        = gbm_create_device(fd);
 
    if (!g_gbm_dev)