diff --git a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
index fc25026d6..f58e0d544 100644
--- a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
@@ -279,6 +279,13 @@ public class SPVBlockStore implements BlockStore {
     @Override
     @Nullable
     public StoredBlock get(Sha256Hash hash) throws BlockStoreException {
+        if (hash.equals(Sha256Hash.ZERO_HASH)) {
+            // Valid blocks will never hash to zero, as it will need an astronomical amount of mining to create one.
+            // Nevertheless, we need to catch this case here because our ring buffer contains all zeros at the
+            // beginning so this method would indeed locate and return an invalid block.
+            return null;
+        }
+
         final MappedByteBuffer buffer = this.buffer;
         if (buffer == null) throw new BlockStoreException("Store closed");
 
diff --git a/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java b/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java
index e31b03be8..8587dc255 100644
--- a/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java
+++ b/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java
@@ -93,6 +93,14 @@ public class SPVBlockStoreTest {
         store.close();
     }
 
+    @Test
+    public void get_zeroHash() throws Exception {
+        SPVBlockStore store = new SPVBlockStore(TESTNET, blockStoreFile);
+        // Needs to fail locating a block even though our fresh ring buffer is full of zero hashes.
+        StoredBlock b = store.get(Sha256Hash.ZERO_HASH);
+        assertNull(b);
+    }
+
     @Test(expected = BlockStoreException.class)
     public void twoStores_onSameFile() throws Exception {
         new SPVBlockStore(TESTNET, blockStoreFile);