diff --git a/docs/app.go b/docs/app.go
index fefeb084..72ac4f06 100644
--- a/docs/app.go
+++ b/docs/app.go
@@ -31,6 +31,8 @@ type App struct {
 
 	tokenProvider tokenProvider
 
+	layerHandler storage.LayerHandler
+
 	accessController auth.AccessController
 }
 
@@ -76,6 +78,16 @@ func NewApp(configuration configuration.Configuration) *App {
 		app.accessController = accessController
 	}
 
+	layerHandlerType := configuration.LayerHandler.Type()
+
+	if layerHandlerType != "" {
+		lh, err := storage.GetLayerHandler(layerHandlerType, configuration.LayerHandler.Parameters(), driver)
+		if err != nil {
+			panic(fmt.Sprintf("unable to configure layer handler (%s): %v", layerHandlerType, err))
+		}
+		app.layerHandler = lh
+	}
+
 	return app
 }
 
diff --git a/docs/layer.go b/docs/layer.go
index a7c46c31..836df3b7 100644
--- a/docs/layer.go
+++ b/docs/layer.go
@@ -58,5 +58,13 @@ func (lh *layerHandler) GetLayer(w http.ResponseWriter, r *http.Request) {
 	}
 	defer layer.Close()
 
+	if lh.layerHandler != nil {
+		handler, _ := lh.layerHandler.Resolve(layer)
+		if handler != nil {
+			handler.ServeHTTP(w, r)
+			return
+		}
+	}
+
 	http.ServeContent(w, r, layer.Digest().String(), layer.CreatedAt(), layer)
 }