diff --git a/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java b/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java
index 58fdc322..3d7afbd6 100644
--- a/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java
+++ b/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java
@@ -212,13 +212,11 @@ public class MapChunkCache115 extends AbstractMapChunkCache {
 	            			states[j] = (v < palette.length) ? palette[v] : DynmapBlockState.AIR;
 	            		}
 	            	}
-	            }
-	            if (sec.hasKey("BlockLight")) {
-	            	cursect.emitlight = sec.getByteArray("BlockLight");
-	            }
-	            if (sec.hasKey("SkyLight")) {
-	                cursect.skylight = sec.getByteArray("SkyLight");
-	            }
+				}
+				byte[] emitlight  = sec.getByteArray("BlockLight");
+				cursect.emitlight = (emitlight == null) ? emptyData : emitlight.clone();
+				byte[] skylight = sec.getByteArray("SkyLight");
+				cursect.skylight = (skylight == null) ? fullData : skylight.clone();
 	        }
 	        /* Get biome data */
 	        this.biome = new int[COLUMNS_PER_CHUNK];