diff --git a/src/tilemaps/Tilemap.js b/src/tilemaps/Tilemap.js
index 248f6d5e3..eacab001a 100644
--- a/src/tilemaps/Tilemap.js
+++ b/src/tilemaps/Tilemap.js
@@ -423,8 +423,16 @@ var Tilemap = new Class({
 
         if (tileset)
         {
-            tileset.setTileSize(tileWidth, tileHeight);
-            tileset.setSpacing(tileMargin, tileSpacing);
+            if (tileWidth || tileHeight)
+            {
+                tileset.setTileSize(tileWidth, tileHeight);
+            }
+
+            if (tileMargin || tileSpacing)
+            {
+                tileset.setSpacing(tileMargin, tileSpacing);
+            }
+
             tileset.setImage(texture);
 
             return tileset;