diff --git a/host/gl/glestranslator/egl/egl_display.cpp b/host/gl/glestranslator/egl/egl_display.cpp
index c828e78ce..7804a005a 100644
--- a/host/gl/glestranslator/egl/egl_display.cpp
+++ b/host/gl/glestranslator/egl/egl_display.cpp
@@ -38,6 +38,10 @@ EglDisplay::EglDisplay(EGLNativeDisplayType dpy,
 EglDisplay::~EglDisplay() {
     gfxstream::base::AutoLock mutex(m_lock);
 
+    // In case terminate() was not called:
+    m_contexts.clear();
+    m_surfaces.clear();
+
     m_configs.clear();
 
     delete m_manager[GLES_1_1];