diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 021981a80e..cc99181fe1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3254,6 +3254,11 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs
                 renderMode = RenderArgs::MIRROR_RENDER_MODE;
             }
             _entities.render(renderMode, renderSide, renderDebugFlags);
+            
+            if (!Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {
+                // Restaure polygon mode
+                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+            }
         }
 
         // render JS/scriptable overlays
diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp
index 5cb2e8b917..3c0ff4b309 100644
--- a/libraries/gpu/src/gpu/GLBackend.cpp
+++ b/libraries/gpu/src/gpu/GLBackend.cpp
@@ -93,11 +93,6 @@ void GLBackend::render(Batch& batch) {
         command++;
         offset++;
     }
-    
-    // Restaure GL default state
-    for (auto command : gpu::GLBackend::GLState::_resetStateCommands) {
-        command->run(this);
-    }
 }
 
 void GLBackend::renderBatch(Batch& batch) {