diff --git a/src/Engine_Object.cc b/src/Engine_Object.cc
index 93f016c..46473a0 100644
--- a/src/Engine_Object.cc
+++ b/src/Engine_Object.cc
@@ -522,7 +522,6 @@ void Engine::Object::draw()
 
         if (m_is_managed)
         {
-            glUseProgram(0);
             glCallList(m_display_list);
         }
         else
@@ -614,6 +613,7 @@ void Engine::Object::draw()
                         (GLvoid *) (sizeof(GLushort) * m.first_vertex));
                 glBindBuffer(GL_ARRAY_BUFFER, 0);
                 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+                glUseProgram(0);
             }
         }