diff --git a/redirect.services.yml b/redirect.services.yml
index 0ccb30d..743bd93 100644
--- a/redirect.services.yml
+++ b/redirect.services.yml
@@ -24,3 +24,7 @@ services:
     arguments: ['@url_generator', '@path.matcher', '@config.factory', '@redirect.checker']
     tags:
       - { name: event_subscriber }
+  redirect.route_subscriber:
+    class: Drupal\redirect\Routing\RouteSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/src/EventSubscriber/RouteNormalizerRequestSubscriber.php b/src/EventSubscriber/RouteNormalizerRequestSubscriber.php
index e050331..caed6fd 100644
--- a/src/EventSubscriber/RouteNormalizerRequestSubscriber.php
+++ b/src/EventSubscriber/RouteNormalizerRequestSubscriber.php
@@ -90,7 +90,7 @@ class RouteNormalizerRequestSubscriber implements EventSubscriberInterface {
     }
 
     $request = $event->getRequest();
-    if ($request->attributes->get('_disable_route_normalizer') || $request->get('_route') == 'image.style_public') {
+    if ($request->attributes->get('_disable_route_normalizer')) {
       return;
     }
 
diff --git a/src/Routing/RouteSubscriber.php b/src/Routing/RouteSubscriber.php
new file mode 100644
index 0000000..be21ef9
--- /dev/null
+++ b/src/Routing/RouteSubscriber.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Drupal\redirect\Routing;
+
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Modify core routes to support redirect.
+ */
+class RouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    if ($route = $collection->get('image.style_public')) {
+      $route->setDefault('_disable_route_normalizer', TRUE);
+    }
+  }
+
+}