diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
index c18425561..b44d72b07 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
@@ -206,7 +206,6 @@ public class ProxyClient extends ProxyCommon {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.READER), 0, new ModelResourceLocation("refinedstorage:reader", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WRITER), 0, new ModelResourceLocation("refinedstorage:writer", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory"));
-        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north"));
@@ -279,6 +278,14 @@ public class ProxyClient extends ProxyCommon {
             }
         });
 
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory"));
+        ModelLoader.setCustomStateMapper(RSBlocks.RELAY, new StateMapperBase() {
+            @Override
+            protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
+                return new ModelResourceLocation("refinedstorage:relay" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties()));
+            }
+        });
+
         ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
             ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack));
 
diff --git a/src/main/resources/assets/refinedstorage/blockstates/relay_glow.json b/src/main/resources/assets/refinedstorage/blockstates/relay_glow.json
new file mode 100644
index 000000000..81b4baa2c
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/blockstates/relay_glow.json
@@ -0,0 +1,27 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "refinedstorage:cube_all_glow",
+    "textures": {
+      "all": "refinedstorage:blocks/relay_disconnected",
+      "glow": "refinedstorage:blocks/none"
+    }
+  },
+  "variants": {
+    "inventory": [
+      {
+        "transform": "forge:default-block"
+      }
+    ],
+    "connected": {
+      "true": {
+        "textures": {
+          "all": "refinedstorage:blocks/relay_connected",
+          "glow": "refinedstorage:blocks/relay_connected_glow"
+        }
+      },
+      "false": {
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png
new file mode 100644
index 000000000..eb9f85c5c
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png.mcmeta
new file mode 100644
index 000000000..eea6c1fe1
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png.mcmeta
@@ -0,0 +1,9 @@
+{
+  "ctm": {
+    "ctm_version": 1,
+    "layer": "CUTOUT",
+    "extra": {
+      "light": 15
+    }
+  }
+}
\ No newline at end of file