diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala
index e045caa00..d559632a1 100644
--- a/src/main/scala/li/cil/oc/common/init/Items.scala
+++ b/src/main/scala/li/cil/oc/common/init/Items.scala
@@ -146,7 +146,7 @@ object Items extends ItemAPI {
   override def registerEEPROM(name: String, code: Array[Byte], data: Array[Byte], readonly: Boolean): ItemStack = {
     val nbt = new NBTTagCompound()
     if (name != null) {
-      nbt.setString(Settings.namespace + "label", name.trim.take(16))
+      nbt.setString(Settings.namespace + "label", name.trim.take(24))
     }
     if (code != null) {
       nbt.setByteArray(Settings.namespace + "eeprom", code.take(Settings.get.eepromSize))
diff --git a/src/main/scala/li/cil/oc/server/component/EEPROM.scala b/src/main/scala/li/cil/oc/server/component/EEPROM.scala
index 5594d386b..2e70c6dbf 100644
--- a/src/main/scala/li/cil/oc/server/component/EEPROM.scala
+++ b/src/main/scala/li/cil/oc/server/component/EEPROM.scala
@@ -54,7 +54,7 @@ class EEPROM extends prefab.ManagedEnvironment {
     if (readonly) {
       return result(Unit, "storage is readonly")
     }
-    label = args.optString(0, "EEPROM").trim.take(16)
+    label = args.optString(0, "EEPROM").trim.take(24)
     if (label.length == 0) label = "EEPROM"
     result(label)
   }