diff --git a/src/Buffer.h b/src/Buffer.h
index 93ff82dd9..6df02acad 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -321,6 +321,8 @@ class MAGNUM_EXPORT Buffer {
          *
          * @todo Allow binding to Target::ElementArray only if VAO is bound
          *      to avoid potential issues?
+         * @bug Binding to ElementArray if any VAO is active will corrupt the mesh
+         * @todo Don't allow user to bind buffers?
          * @see @fn_gl{BindBuffer}
          */
         inline void bind(Target target) { bind(target, _id); }
diff --git a/src/Mesh.cpp b/src/Mesh.cpp
index 719fc4b79..1fad6de36 100644
--- a/src/Mesh.cpp
+++ b/src/Mesh.cpp
@@ -162,9 +162,7 @@ void Mesh::unbindImplementationDefault() {
 }
 
 #ifndef MAGNUM_TARGET_GLES
-void Mesh::unbindImplementationVAO() {
-    bindVAO(0);
-}
+void Mesh::unbindImplementationVAO() {}
 #endif
 
 }