diff --git a/Source/Glide64/Debugger.cpp b/Source/Glide64/Debugger.cpp
index 8775524d4..e09454c0e 100644
--- a/Source/Glide64/Debugger.cpp
+++ b/Source/Glide64/Debugger.cpp
@@ -1045,6 +1045,11 @@ int grDisplayGLError(const char* message)
     GLenum status;
     unsigned int error_index;
     int failure;
+    const short debug_setting = FindSystemSettingId("Debugger");
+    const unsigned int Project64_debugging = GetSystemSetting(debug_setting);
+
+    if (Project64_debugging == 0)
+        return (failure = -1); /* error checking for errors:  pj64 debug off */
 
     status = glGetError();
     failure = 1;
diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp
index ea4f83e02..73b60ce6a 100644
--- a/Source/Glide64/Main.cpp
+++ b/Source/Glide64/Main.cpp
@@ -1890,9 +1890,7 @@ void CALL UpdateScreen (void)
   if (fullscreen && (*gfx.VI_ORIGIN_REG  > width))
     update_screen_count++;
 
-#if defined(_DEBUG) || 0
   grDisplayGLError("UpdateScreen");
-#endif
 
 #ifdef FPS
   // vertical interrupt has occurred, increment counter