diff --git a/changelog.md b/changelog.md
index f87fa0a52..517ab0846 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,8 @@
 * [#3769] Add default user agent configuration option; change OpenComputers' default user agent to "opencomputers/$version".
 * [#3759] Add V1 and V2 to the robot name list. (AutumnalModding)
 * [#3727] Fix more regressions related to OpenOS error handling. (jasonS05, kcinnajlol)
+* Fix client-side memory leak on anything RedstoneAware (Glease)
 
 ## List of contributors
 
-asie, AutumnalModding, jasonS05, kcinnajlol
+asie, AutumnalModding, Glease, jasonS05, kcinnajlol
diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
index c2a356322..6fedf0399 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
@@ -126,7 +126,7 @@ trait RedstoneAware extends RotationAware {
 
   override def validate(): Unit = {
     super.validate()
-    if (!this.isInstanceOf[Tickable]) {
+    if (!this.isInstanceOf[Tickable] && isServer) {
       EventHandler.scheduleServer(() => EnumFacing.values().foreach(updateRedstoneInput))
     }
   }