diff --git a/src/main/java/org/qortal/controller/repository/BlockArchiver.java b/src/main/java/org/qortal/controller/repository/BlockArchiver.java
index aab4b4fa..d6860347 100644
--- a/src/main/java/org/qortal/controller/repository/BlockArchiver.java
+++ b/src/main/java/org/qortal/controller/repository/BlockArchiver.java
@@ -71,7 +71,6 @@ public class BlockArchiver implements Runnable {
 						case STOPPING:
 							return;
 
-						case BLOCK_LIMIT_REACHED:
 							// We've reached the limit of the blocks we can archive
 							// Sleep for a while to allow more to become available
 						case NOT_ENOUGH_BLOCKS:
diff --git a/src/main/java/org/qortal/repository/BlockArchiveWriter.java b/src/main/java/org/qortal/repository/BlockArchiveWriter.java
index 59d07072..efef689e 100644
--- a/src/main/java/org/qortal/repository/BlockArchiveWriter.java
+++ b/src/main/java/org/qortal/repository/BlockArchiveWriter.java
@@ -24,7 +24,6 @@ public class BlockArchiveWriter {
         OK,
         STOPPING,
         NOT_ENOUGH_BLOCKS,
-        BLOCK_LIMIT_REACHED,
         BLOCK_NOT_FOUND
     }
 
@@ -99,7 +98,7 @@ public class BlockArchiveWriter {
 
             int currentHeight = startHeight + i;
             if (currentHeight >= endHeight) {
-                return BlockArchiveWriteResult.BLOCK_LIMIT_REACHED;
+                break;
             }
 
             //LOGGER.info("Fetching block {}...", currentHeight);
diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseArchiving.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseArchiving.java
index 7a7b66f3..618d5115 100644
--- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseArchiving.java
+++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseArchiving.java
@@ -59,7 +59,6 @@ public class HSQLDBDatabaseArchiving {
                         case STOPPING:
                             return false;
 
-                        case BLOCK_LIMIT_REACHED:
                         case NOT_ENOUGH_BLOCKS:
                             // We've reached the limit of the blocks we can archive
                             // Return from the whole method