diff --git a/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java b/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
index 3379bf0..28108a9 100644
--- a/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
+++ b/src/main/java/edu/ucla/library/iiif/fester/verticles/V2ManifestVerticle.java
@@ -513,8 +513,12 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
                         imageResource = new ImageResource(resourceURI);
                         imageResource.setWidth(mediaWidth);
                         imageResource.setHeight(mediaHeight);
-                        imageResource.setService(new ImageInfoService(APIComplianceLevel.TWO, pageURI));
-                        staticImage = true;
+
+                        if (!accessURI.matches("^.+\\.[^.]+$")) { // Does the URI have a file extension?
+                            imageResource.setService(new ImageInfoService(APIComplianceLevel.TWO, pageURI));
+                        } else {
+                            staticImage = true;
+                        }
                     } else {
                         // If we don't have both width and height in the CSV, we can also try to look it up
                         final ImageInfoLookup infoLookup = new ImageInfoLookup(pageURI);
diff --git a/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java b/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
index 71e9977..9ba88c5 100644
--- a/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
+++ b/src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
@@ -577,16 +577,20 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
                     if (mediaWidth.isPresent() && mediaHeight.isPresent()) {
                         width = Integer.parseInt(mediaWidth.get());
                         height = Integer.parseInt(mediaHeight.get());
-                        image = new ImageContent(accessURI);
+                        image = new ImageContent(resourceURI);
+
+                        if (!accessURI.matches("^.+\\.[^.]+$")) { // Does the URI have a file extension?
+                            image.setServices(new ImageService2(pageURI));
+                        }
                     } else {
                         final ImageInfoLookup infoLookup = new ImageInfoLookup(pageURI); // Look up w/h for page URI
 
                         width = infoLookup.getWidth();
                         height = infoLookup.getHeight();
-                        image = new ImageContent(resourceURI);
+                        image = new ImageContent(resourceURI).setServices(new ImageService2(pageURI));
                     }
 
-                    image.setWidthHeight(width, height).setServices(new ImageService2(pageURI));
+                    image.setWidthHeight(width, height);
                     canvas.setWidthHeight(width, height).setThumbnails(new ImageContent(thumbnail));
                     canvas.paintWith(image);
                 } catch (final IOException details) {