diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index 51f5309..70df27f 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -932,13 +932,6 @@
 		return EGL_FALSE;
 	}
 
-	if((draw != EGL_NO_SURFACE && drawSurface->hasClientBuffer()) ||
-	   (read != EGL_NO_SURFACE && readSurface->hasClientBuffer()))
-	{
-		// Make current is not supported on IOSurface pbuffers.
-		return error(EGL_BAD_SURFACE, EGL_FALSE);
-	}
-
 	if((draw != EGL_NO_SURFACE) ^ (read != EGL_NO_SURFACE))
 	{
 		return error(EGL_BAD_MATCH, EGL_FALSE);
diff --git a/tests/GLESUnitTests/unittests.cpp b/tests/GLESUnitTests/unittests.cpp
index db4de08..7951e27 100644
--- a/tests/GLESUnitTests/unittests.cpp
+++ b/tests/GLESUnitTests/unittests.cpp
@@ -2612,8 +2612,8 @@
 	Uninitialize();
 }
 
-// Test IOSurface pbuffers cannot be made current
-TEST_F(IOSurfaceClientBufferTest, MakeCurrentDisallowed)
+// Test IOSurface pbuffers can be made current
+TEST_F(IOSurfaceClientBufferTest, MakeCurrentAllowed)
 {
 	Initialize(3, false);
 
@@ -2623,8 +2623,8 @@
 		EGLSurface pbuffer = createIOSurfacePbuffer(clientBufferWrapper.getClientBuffer(), 10, 10, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE);
 
 		EGLBoolean result = eglMakeCurrent(getDisplay(), pbuffer, pbuffer, getContext());
-		EXPECT_EQ((EGLBoolean)EGL_FALSE, result);
-		EXPECT_EQ(EGL_BAD_SURFACE, eglGetError());
+		EXPECT_EQ((EGLBoolean)EGL_TRUE, result);
+		EXPECT_NO_EGL_ERROR();
 	}
 
 	Uninitialize();