diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index 61f74b7d9fd..026fa5f8560 100644
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -138,6 +138,8 @@ driCreateNewScreen2(int scrn, int fd,
 
     *driver_configs = mesa->initScreen(screen);
     if (*driver_configs == NULL) {
+        driDestroyOptionCache(&screen->optionCache);
+        driDestroyOptionInfo(&screen->optionInfo);
         free(screen);
         return NULL;
     }