diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index cfbf94c1f..237435c97 100644
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -129,12 +129,18 @@ public:
     state.setClientActiveTextureUnit(0);
     state.disableAllVertexArrays();
 
+    glPushAttrib(GL_ALL_ATTRIB_BITS);
+    glPushClientAttrib(~0u);
+
     if((fgGetBool("/sim/atc/enabled"))
        || (fgGetBool("/sim/ai-traffic/enabled")))
       globals->get_ATC_display()->update(delta_time_sec, state);
 
     puDisplay();
 
+    glPopClientAttrib();
+    glPopAttrib();
+
     // Fade out the splash screen over the first three seconds.
     double t = globals->get_sim_time_sec();
     if (t <= 2.5) {