diff --git a/src/main/java/org/qortal/controller/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/ArbitraryDataManager.java
index 61447dbc..1b3311d0 100644
--- a/src/main/java/org/qortal/controller/ArbitraryDataManager.java
+++ b/src/main/java/org/qortal/controller/ArbitraryDataManager.java
@@ -12,6 +12,8 @@ import org.qortal.data.transaction.TransactionData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
+import org.qortal.storage.DataFile;
+import org.qortal.storage.DataFileChunk;
 import org.qortal.transaction.ArbitraryTransaction;
 import org.qortal.transaction.Transaction.TransactionType;
 
@@ -45,20 +47,69 @@ public class ArbitraryDataManager extends Thread {
 				// Any arbitrary transactions we want to fetch data for?
 				try (final Repository repository = RepositoryManager.getRepository()) {
 					List<byte[]> signatures = repository.getTransactionRepository().getSignaturesMatchingCriteria(null, null, null, ARBITRARY_TX_TYPE, null, null, ConfirmationStatus.BOTH, null, null, true);
-					if (signatures == null || signatures.isEmpty())
+					if (signatures == null || signatures.isEmpty()) {
 						continue;
+					}
 
 					// Filter out those that already have local data
 					signatures.removeIf(signature -> hasLocalData(repository, signature));
 
-					if (signatures.isEmpty())
+					if (signatures.isEmpty()) {
 						continue;
+					}
 
 					// Pick one at random
 					final int index = new Random().nextInt(signatures.size());
 					byte[] signature = signatures.get(index);
 
-					Controller.getInstance().fetchArbitraryData(signature);
+					// Load the full transaction data so we can access the file hashes
+					ArbitraryTransactionData transactionData = (ArbitraryTransactionData)repository.getTransactionRepository().fromSignature(signature);
+					if (!(transactionData instanceof ArbitraryTransactionData)) {
+						signatures.remove(signature);
+						continue;
+					}
+
+					// Load hashes
+					byte[] digest = transactionData.getData();
+					byte[] chunkHashes = transactionData.getChunkHashes();
+
+					// Load data file(s)
+					DataFile dataFile = DataFile.fromDigest(digest);
+					if (chunkHashes.length > 0) {
+						dataFile.addChunkHashes(chunkHashes);
+
+						// Now try and fetch each chunk in turn if we don't have them already
+						for (DataFileChunk dataFileChunk : dataFile.getChunks()) {
+							if (!dataFileChunk.exists()) {
+								LOGGER.info("Requesting chunk {}...", dataFileChunk);
+								boolean success = Controller.getInstance().fetchArbitraryDataFile(dataFileChunk.getHash());
+								if (success) {
+									LOGGER.info("Chunk {} received", dataFileChunk);
+								}
+								else {
+									LOGGER.info("Couldn't retrieve chunk {}", dataFileChunk);
+								}
+							}
+						}
+					}
+					else if (transactionData.getSize() < DataFileChunk.CHUNK_SIZE) {
+						// Fetch the complete file, as it is less than the chunk size
+						LOGGER.info("Requesting file {}...", dataFile.getHash58());
+						boolean success = Controller.getInstance().fetchArbitraryDataFile(dataFile.getHash());
+						if (success) {
+							LOGGER.info("File {} received", dataFile);
+						}
+						else {
+							LOGGER.info("Couldn't retrieve file {}", dataFile);
+						}
+					}
+					else {
+						// Invalid transaction (should have already failed validation)
+						LOGGER.info(String.format("Invalid arbitrary transaction: %.8s", signature));
+					}
+
+					signatures.remove(signature);
+
 				} catch (DataException e) {
 					LOGGER.error("Repository issue when fetching arbitrary transaction data", e);
 				}
diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java
index 8f56bd5a..cd0d14ac 100644
--- a/src/main/java/org/qortal/controller/Controller.java
+++ b/src/main/java/org/qortal/controller/Controller.java
@@ -457,8 +457,8 @@ public class Controller extends Thread {
 		blockMinter.start();
 
 		// Arbitrary transaction data manager
-		// LOGGER.info("Starting arbitrary-transaction data manager");
-		// ArbitraryDataManager.getInstance().start();
+		LOGGER.info("Starting arbitrary-transaction data manager");
+		ArbitraryDataManager.getInstance().start();
 
 		// Auto-update service?
 		if (Settings.getInstance().isAutoUpdateEnabled()) {
@@ -920,8 +920,8 @@ public class Controller extends Thread {
 				}
 
 				// Arbitrary transaction data manager
-				// LOGGER.info("Shutting down arbitrary-transaction data manager");
-				// ArbitraryDataManager.getInstance().shutdown();
+				LOGGER.info("Shutting down arbitrary-transaction data manager");
+				ArbitraryDataManager.getInstance().shutdown();
 
 				if (blockMinter != null) {
 					LOGGER.info("Shutting down block minter");
@@ -2022,13 +2022,13 @@ public class Controller extends Thread {
 		}
 	}
 
-	public byte[] fetchArbitraryData(byte[] signature) throws InterruptedException {
+	public boolean fetchArbitraryDataFile(byte[] hash) throws InterruptedException {
 		// Build request
-		Message getArbitraryDataMessage = new GetArbitraryDataMessage(signature);
+		Message getDataFileMessage = new GetDataFileMessage(hash);
 
 		// Save our request into requests map
-		String signature58 = Base58.encode(signature);
-		Triple<String, Peer, Long> requestEntry = new Triple<>(signature58, null, NTP.getTime());
+		String hash58 = Base58.encode(hash);
+		Triple<String, Peer, Long> requestEntry = new Triple<>(hash58, null, NTP.getTime());
 
 		// Assign random ID to this message
 		int id;
@@ -2038,10 +2038,10 @@ public class Controller extends Thread {
 			// Put queue into map (keyed by message ID) so we can poll for a response
 			// If putIfAbsent() doesn't return null, then this ID is already taken
 		} while (arbitraryDataRequests.put(id, requestEntry) != null);
-		getArbitraryDataMessage.setId(id);
+		getDataFileMessage.setId(id);
 
 		// Broadcast request
-		Network.getInstance().broadcast(peer -> getArbitraryDataMessage);
+		Network.getInstance().broadcast(peer -> getDataFileMessage);
 
 		// Poll to see if data has arrived
 		final long singleWait = 100;
@@ -2051,20 +2051,14 @@ public class Controller extends Thread {
 
 			requestEntry = arbitraryDataRequests.get(id);
 			if (requestEntry == null)
-				return null;
+				return false;
 
 			if (requestEntry.getA() == null)
 				break;
 
 			totalWait += singleWait;
 		}
-
-		try (final Repository repository = RepositoryManager.getRepository()) {
-			return repository.getArbitraryRepository().fetchData(signature);
-		} catch (DataException e) {
-			LOGGER.error(String.format("Repository issue while fetching arbitrary transaction data"), e);
-			return null;
-		}
+		return true;
 	}
 
 	/** Returns a list of peers that are not misbehaving, and have a recent block. */