diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d11795d5..be9843a85 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.5.16
+- Fixed crash when placing a Controller (raoulvdberge)
+
 ### 1.5.15
 - Updated Forge to 2444 (MC 1.12.1) (raoulvdberge)
 - Added InventoryTweaks Grid sorting (cooliojazz)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index 520e3c5c7..9ae1fc8e1 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -144,7 +144,7 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
     private boolean craftingMonitorUpdateRequested;
 
     private ControllerType type;
-    private ControllerEnergyType energyType;
+    private ControllerEnergyType energyType = ControllerEnergyType.OFF;
 
     private RedstoneMode redstoneMode = RedstoneMode.IGNORE;