diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 6b0b4f0a2..49daa8c70 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -2643,7 +2643,7 @@ class Level implements ChunkManager, Metadatable{
 				if($trySave and $this->getAutoSave() and $chunk->isGenerated()){
 					$entities = 0;
 					foreach($chunk->getEntities() as $e){
-						if($e instanceof Player){
+						if(!$e->canSaveWithChunk()){
 							continue;
 						}
 						++$entities;