diff --git a/src/video/raspberry/SDL_rpivideo.c b/src/video/raspberry/SDL_rpivideo.c
index c271a237b..fae9143b6 100644
--- a/src/video/raspberry/SDL_rpivideo.c
+++ b/src/video/raspberry/SDL_rpivideo.c
@@ -284,15 +284,14 @@ RPI_CreateWindow(_THIS, SDL_Window * window)
 void
 RPI_DestroyWindow(_THIS, SDL_Window * window)
 {
-    SDL_WindowData *data;
-        
-    if(window->driverdata) {
-        data = (SDL_WindowData *) window->driverdata;
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    if(data) {
+#if SDL_VIDEO_OPENGL_EGL
         if (data->egl_surface != EGL_NO_SURFACE) {
             SDL_EGL_DestroySurface(_this, data->egl_surface);
-            data->egl_surface = EGL_NO_SURFACE;
         }
-        SDL_free(window->driverdata);
+#endif
+        SDL_free(data);
         window->driverdata = NULL;
     }
 }