diff --git a/li/cil/oc/common/tileentity/Computer.scala b/li/cil/oc/common/tileentity/Computer.scala
index 63a673097..72f934a7b 100644
--- a/li/cil/oc/common/tileentity/Computer.scala
+++ b/li/cil/oc/common/tileentity/Computer.scala
@@ -131,7 +131,9 @@ abstract class Computer(isRemote: Boolean) extends Environment with ComponentInv
 
   override def writeToNBT(nbt: NBTTagCompound) {
     super.writeToNBT(nbt)
-    nbt.setNewCompoundTag(Settings.namespace + "computer", computer.save)
+    if (!new Exception().getStackTrace.exists(_.getClassName.startsWith("mcp.mobius.waila"))) {
+      nbt.setNewCompoundTag(Settings.namespace + "computer", computer.save)
+    }
   }
 
   @SideOnly(Side.CLIENT)
diff --git a/li/cil/oc/common/tileentity/Rack.scala b/li/cil/oc/common/tileentity/Rack.scala
index 04d49b85a..d7cecaade 100644
--- a/li/cil/oc/common/tileentity/Rack.scala
+++ b/li/cil/oc/common/tileentity/Rack.scala
@@ -189,13 +189,15 @@ class Rack extends Hub with PowerBalancer with Inventory with Rotatable with Bun
   }
 
   override def writeToNBT(nbt: NBTTagCompound) {
-    nbt.setNewTagList(Settings.namespace + "servers", servers map {
-      case Some(server) =>
-        val serverNbt = new NBTTagCompound()
-        server.save(serverNbt)
-        serverNbt
-      case _ => new NBTTagCompound()
-    })
+    if (!new Exception().getStackTrace.exists(_.getClassName.startsWith("mcp.mobius.waila"))) {
+      nbt.setNewTagList(Settings.namespace + "servers", servers map {
+        case Some(server) =>
+          val serverNbt = new NBTTagCompound()
+          server.save(serverNbt)
+          serverNbt
+        case _ => new NBTTagCompound()
+      })
+    }
     super.writeToNBT(nbt)
     nbt.setByteArray(Settings.namespace + "sides", sides.map(_.ordinal.toByte))
     nbt.setNewTagList(Settings.namespace + "terminals", terminals.map(t => {