diff --git a/src/Engine_Object.cc b/src/Engine_Object.cc
index 46473a0..51668cc 100644
--- a/src/Engine_Object.cc
+++ b/src/Engine_Object.cc
@@ -611,10 +611,10 @@ void Engine::Object::draw()
                 glDrawElements(GL_TRIANGLES, m.num_vertices,
                         GL_UNSIGNED_SHORT,
                         (GLvoid *) (sizeof(GLushort) * m.first_vertex));
-                glBindBuffer(GL_ARRAY_BUFFER, 0);
-                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-                glUseProgram(0);
             }
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+            glUseProgram(0);
         }
 
         checkGLError();