diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
index 817dc645..2a3c0342 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
@@ -89,20 +89,25 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
             // Scan forward
             while (true) {
                 long realPosition = stream.getStreamPosition();
-                int marker = stream.readUnsignedShort();
 
-                // Skip over weird 0x00 padding, but leave in stream, read seems to handle it well with a warning
                 int trash = 0;
-                while (marker == 0) {
-                    marker = stream.readUnsignedShort();
-                    trash += 2;
+                int marker = stream.readUnsignedByte();
+
+                // Skip bad padding before the marker
+                while (marker != 0xff) {
+                    marker = stream.readUnsignedByte();
+                    trash++;
+                    realPosition++;
                 }
 
-                if (marker == 0x00ff) {
-                    trash++;
-                    marker = 0xff00 | stream.readUnsignedByte();
+                if (trash != 0) {
+                    // NOTE: We previously allowed these bytes to pass through to the native reader, as it could cope
+                    // and issued the correct warning. However, the native metadata chokes on it, so we'll mask it out.
+                    // TODO: Issue warning from the JPEGImageReader, telling how many bytes we skipped
                 }
 
+                marker = 0xff00 | stream.readUnsignedByte();
+
                 // Skip over 0xff padding between markers
                 while (marker == 0xffff) {
                     realPosition++;
@@ -113,7 +118,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
                 // TODO: Refactor to make various segments optional, we probably only want the "Adobe" APP14 segment, 'Exif' APP1 and very few others
                 if (isAppSegmentMarker(marker) && !(marker == JPEG.APP1 && isAppSegmentWithId("Exif", stream)) && marker != JPEG.APP14) {
                     int length = stream.readUnsignedShort(); // Length including length field itself
-                    stream.seek(realPosition + trash + 2 + length);  // Skip marker (2) + length
+                    stream.seek(realPosition + 2 + length);  // Skip marker (2) + length
                 }
                 else {
                     if (marker == JPEG.EOI) {
@@ -129,7 +134,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
                         }
                         else {
                             // Length including length field itself
-                            length = trash + stream.readUnsignedShort() + 2;
+                            length = stream.readUnsignedShort() + 2;
                         }
 
                         segment = new Segment(marker, realPosition, segment.end(), length);
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index 6ddbbb0f..169d7bbe 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -87,7 +87,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
                 new TestData(getClassLoaderResource("/jpeg/cmyk-sample.jpg"), new Dimension(160, 227)),
                 new TestData(getClassLoaderResource("/jpeg/cmyk-sample-multiple-chunk-icc.jpg"), new Dimension(2707, 3804)),
                 new TestData(getClassLoaderResource("/jpeg/jfif-jfxx-thumbnail-olympus-d320l.jpg"), new Dimension(640, 480)),
-                new TestData(getClassLoaderResource("/jpeg/jfif-padded-segments.jpg"), new Dimension(20, 45))
+                new TestData(getClassLoaderResource("/jpeg/jfif-padded-segments.jpg"), new Dimension(20, 45)),
+                new TestData(getClassLoaderResource("/jpeg/0x00-to-0xFF-between-segments.jpg"), new Dimension(16, 16))
         );
 
         // More test data in specific tests below
diff --git a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java
index 7ff422e1..a5a46cfd 100644
--- a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java
+++ b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/jpeg/JPEGSegmentUtil.java
@@ -159,23 +159,21 @@ public final class JPEGSegmentUtil {
     }
 
     static JPEGSegment readSegment(final ImageInputStream stream, final Map<Integer, List<String>> segmentIdentifiers) throws IOException {
-        int marker = stream.readUnsignedShort();
+//        int trash = 0;
+        int marker = stream.readUnsignedByte();
 
-        // Skip over weird 0x00 padding...?
-        int bad = 0;
-        while (marker == 0) {
-            marker = stream.readUnsignedShort();
-            bad += 2;
+        // Skip trash padding before the marker
+        while (marker != 0xff) {
+            marker = stream.readUnsignedByte();
+//            trash++;
         }
 
-        if (marker == 0x00ff) {
-            bad++;
-            marker = 0xff00 | stream.readUnsignedByte();
-        }
+//        if (trash != 0) {
+            // TODO: Issue warning?
+//            System.err.println("trash: " + trash);
+//        }
 
-        if (bad != 0) {
-//            System.err.println("bad: " + bad);
-        }
+        marker = 0xff00 | stream.readUnsignedByte();
 
         // Skip over 0xff padding between markers
         while (marker == 0xffff) {