diff --git a/src/iiif1_1tilesource.js b/src/iiif1_1tilesource.js
index 6e022d3b..966f8c17 100644
--- a/src/iiif1_1tilesource.js
+++ b/src/iiif1_1tilesource.js
@@ -51,7 +51,12 @@ $.IIIF1_1TileSource = function( options ){
         throw new Error('IIIF required parameters not provided.');
     }
 
-    options.tileSize = this.tile_width;
+    if ( !(this.tile_width && this.tile_height) ) {
+        // use the short dimension if there aren't tile sizes provided.
+        options.tileSize = Math.min(this.height, this.width);
+    } else {
+        options.tileSize = this.tile_width;
+    }
 
     if (! options.maxLevel ) {
         var mf = -1;
@@ -83,7 +88,6 @@ $.extend( $.IIIF1_1TileSource.prototype, $.TileSource.prototype, {
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0" == data.profile ||
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1" == data.profile ||
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2" == data.profile ||
-            "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level3" == data.profile ||
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html" == data.profile
         );
     },
diff --git a/test/data/iiif_no_tiles.json b/test/data/iiif_no_tiles.json
new file mode 100644
index 00000000..7f677b32
--- /dev/null
+++ b/test/data/iiif_no_tiles.json
@@ -0,0 +1,19 @@
+{
+  "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2",
+  "height": 850,
+  "width": 1024,
+  "qualities": [
+    "native",
+    "color",
+    "grey",
+    "bitonal"
+  ],
+  "formats": [
+    "jpg",
+    "png",
+    "gif"
+  ],
+  "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json",
+  "@id": "http://localhost:8000/test/data/iiif_no_tiles"
+}
+
diff --git a/test/data/iiif_no_tiles/0,0,1024,850/128,107/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/128,107/0/native.jpg
new file mode 100644
index 00000000..e0bacd02
Binary files /dev/null and b/test/data/iiif_no_tiles/0,0,1024,850/128,107/0/native.jpg differ
diff --git a/test/data/iiif_no_tiles/0,0,1024,850/16,14/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/16,14/0/native.jpg
new file mode 100644
index 00000000..4cee30fa
Binary files /dev/null and b/test/data/iiif_no_tiles/0,0,1024,850/16,14/0/native.jpg differ
diff --git a/test/data/iiif_no_tiles/0,0,1024,850/256,213/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/256,213/0/native.jpg
new file mode 100644
index 00000000..6c8c5441
Binary files /dev/null and b/test/data/iiif_no_tiles/0,0,1024,850/256,213/0/native.jpg differ
diff --git a/test/data/iiif_no_tiles/0,0,1024,850/32,27/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/32,27/0/native.jpg
new file mode 100644
index 00000000..f97752d8
Binary files /dev/null and b/test/data/iiif_no_tiles/0,0,1024,850/32,27/0/native.jpg differ
diff --git a/test/data/iiif_no_tiles/0,0,1024,850/512,425/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/512,425/0/native.jpg
new file mode 100644
index 00000000..c3300449
Binary files /dev/null and b/test/data/iiif_no_tiles/0,0,1024,850/512,425/0/native.jpg differ
diff --git a/test/data/iiif_no_tiles/0,0,1024,850/64,54/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/64,54/0/native.jpg
new file mode 100644
index 00000000..ad7f30c8
Binary files /dev/null and b/test/data/iiif_no_tiles/0,0,1024,850/64,54/0/native.jpg differ
diff --git a/test/data/iiif_no_tiles/0,0,1024,850/8,7/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/8,7/0/native.jpg
new file mode 100644
index 00000000..893409b0
Binary files /dev/null and b/test/data/iiif_no_tiles/0,0,1024,850/8,7/0/native.jpg differ
diff --git a/test/data/iiif_no_tiles/full/full/0/native.jpg b/test/data/iiif_no_tiles/full/full/0/native.jpg
new file mode 100644
index 00000000..dcc1d22b
Binary files /dev/null and b/test/data/iiif_no_tiles/full/full/0/native.jpg differ
diff --git a/test/formats.js b/test/formats.js
index e0915a5c..9cabf816 100644
--- a/test/formats.js
+++ b/test/formats.js
@@ -80,4 +80,9 @@
         testOpen('iiif1_1.json');
     });
 
+        // ----------
+    asyncTest('IIIF No Tiles', function() {
+        testOpen('iiif_no_tiles.json');
+    });
+
 })();