diff --git a/endpoints/v1/registry.py b/endpoints/v1/registry.py
index 096d51e73..de4dc9192 100644
--- a/endpoints/v1/registry.py
+++ b/endpoints/v1/registry.py
@@ -7,7 +7,7 @@ from functools import wraps
 from datetime import datetime
 from time import time
 
-from app import storage as store, image_diff_queue, image_replication_queue, app
+from app import storage as store, image_replication_queue, app
 from auth.auth import process_auth, extract_namespace_repo_from_session
 from auth.auth_context import get_authenticated_user, get_grant_user_context
 from digest import checksums
@@ -60,20 +60,9 @@ def _finish_image(namespace, repository, repo_image):
   # Checksum is ok, we remove the marker
   set_uploading_flag(repo_image, False)
 
-  image_id = repo_image.docker_image_id
-
-  # The layer is ready for download, send a job to the work queue to
-  # process it.
-  logger.debug('Adding layer to diff queue')
-  repo = model.repository.get_repository(namespace, repository)
-  image_diff_queue.put([repo.namespace_user.username, repository, image_id], json.dumps({
-    'namespace_user_id': repo.namespace_user.id,
-    'repository': repository,
-    'image_id': image_id,
-  }))
-
   # Send a job to the work queue to replicate the image layer.
   if features.STORAGE_REPLICATION:
+    repo = model.repository.get_repository(namespace, repository)
     image_replication_queue.put([repo_image.storage.uuid], json.dumps({
       'namespace_user_id': repo.namespace_user.id,
       'storage_id': repo_image.storage.uuid,