diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala
index 1f207ea6f..3e92416b2 100644
--- a/src/main/scala/li/cil/oc/common/Proxy.scala
+++ b/src/main/scala/li/cil/oc/common/Proxy.scala
@@ -82,7 +82,10 @@ class Proxy {
     if (api.Machine.architectures.size == 0) {
       api.Machine.add(classOf[LuaJLuaArchitecture])
     }
-    api.Machine.LuaArchitecture = api.Machine.architectures.head
+    
+    api.Machine.LuaArchitecture =
+      if (Settings.get.forceLuaJ) classOf[LuaJLuaArchitecture]
+      else api.Machine.architectures.head
   }
 
   def init(e: FMLInitializationEvent) {