diff --git a/li/cil/oc/server/component/Computer.scala b/li/cil/oc/server/component/Computer.scala
index 9a9ee05b0..2651385c0 100644
--- a/li/cil/oc/server/component/Computer.scala
+++ b/li/cil/oc/server/component/Computer.scala
@@ -1018,8 +1018,8 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
                 lua.pushBoolean(true)
                 lua.pushNil()
                 lua.pushString(e.getMessage)
-                if (true) {
-                  lua.pushString(e.getStackTraceString)
+                if (Settings.get.logLuaCallbackErrors) {
+                  lua.pushString(e.getStackTraceString.replace("\r\n", "\n"))
                   4
                 }
                 else 3