diff --git a/src/SFML/Window/EglContext.cpp b/src/SFML/Window/EglContext.cpp
index aa751ba8..d18396f1 100644
--- a/src/SFML/Window/EglContext.cpp
+++ b/src/SFML/Window/EglContext.cpp
@@ -180,7 +180,8 @@ bool EglContext::makeCurrent()
 ////////////////////////////////////////////////////////////
 void EglContext::display()
 {
-    eglCheck(eglSwapBuffers(m_display, m_surface));
+    if (m_surface != EGL_NO_SURFACE)
+        eglCheck(eglSwapBuffers(m_display, m_surface));
 }