diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 7ad0f75e1..f19d9d623 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -612,17 +612,16 @@ class Level implements ChunkManager, Metadatable{
 		$this->timings->entityTick->stopTiming();
 
 		$this->timings->tileEntityTick->startTiming();
-		Timings::$tickTileEntityTimer->startTiming();
-
 		//Update tiles that need update
 		if(count($this->updateTiles) > 0){
+			//Timings::$tickTileEntityTimer->startTiming();
 			foreach($this->updateTiles as $id => $tile){
 				if($tile->onUpdate() !== true){
 					unset($this->updateTiles[$id]);
 				}
 			}
+			//Timings::$tickTileEntityTimer->stopTiming();
 		}
-		Timings::$tickTileEntityTimer->stopTiming();
 		$this->timings->tileEntityTick->stopTiming();
 
 		$this->timings->doTickTiles->startTiming();
diff --git a/src/pocketmine/level/format/generic/BaseFullChunk.php b/src/pocketmine/level/format/generic/BaseFullChunk.php
index ab1a4d56d..6114c3e8c 100644
--- a/src/pocketmine/level/format/generic/BaseFullChunk.php
+++ b/src/pocketmine/level/format/generic/BaseFullChunk.php
@@ -158,7 +158,7 @@ abstract class BaseFullChunk implements FullChunk{
 
 		}
 
-		if(!$this->isLightPopulated()){
+		if(!$this->isLightPopulated() and $this->isPopulated()){
 			$this->recalculateHeightMap();
 			$this->populateSkyLight();
 			$this->setLightPopulated();
diff --git a/src/pocketmine/resources/pocketmine.yml b/src/pocketmine/resources/pocketmine.yml
index 1d1f80ead..54064e0a9 100644
--- a/src/pocketmine/resources/pocketmine.yml
+++ b/src/pocketmine/resources/pocketmine.yml
@@ -121,7 +121,6 @@ chunk-ticking:
 
 chunk-generation:
  #Max. amount of chunks in the waiting queue to be generated
- #It's recommended to set this to 4 * settings.async-workers
  queue-size: 8
  #Max. amount of chunks in the waiting queue to be populated
  population-queue-size: 2