diff --git a/src/OpenGL/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp
index 584b56d..866912c 100644
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -1071,6 +1071,12 @@
 {
 	TransformFeedback *transformFeedbackObject = mTransformFeedbackNameSpace.remove(transformFeedback);
 
+	// Detach if currently bound.
+	if(mState.transformFeedback == transformFeedback)
+	{
+		mState.transformFeedback = 0;
+	}
+
 	if(transformFeedbackObject)
 	{
 		delete transformFeedbackObject;