diff --git a/app/logical/source/url/art_station.rb b/app/logical/source/url/art_station.rb
index 77a32b5f9..296f062eb 100644
--- a/app/logical/source/url/art_station.rb
+++ b/app/logical/source/url/art_station.rb
@@ -2,7 +2,6 @@
 
 class Source::URL::ArtStation < Source::URL
   RESERVED_SUBDOMAINS = %w[www cdn cdna cdnb]
-  IMAGE_SUBDOMAINS = %w[cdn cdna cdnb]
 
   attr_reader :username, :work_id
 
@@ -35,17 +34,24 @@ class Source::URL::ArtStation < Source::URL
       @work_id = work_id
       @username = subdomain unless subdomain.in?(RESERVED_SUBDOMAINS)
 
+    # https://artstation.com/artist/sa-dui
     # https://www.artstation.com/artist/sa-dui
-    in "www.artstation.com", "artist", username
+    # https://www.artstation.com/artist/chicle/albums/all/
+    in _, "artist", username, *rest
       @username = username
 
+    # http://artstation.com/sha_sha
     # https://www.artstation.com/sa-dui
     # https://www.artstation.com/felipecartin/profile
-    in "www.artstation.com", username, *rest
+    # https://www.artstation.com/chicle/albums/all
+    # https://www.artstation.com/h-battousai/albums/1480261
+    # http://www.artstation.com/envie_dai/prints
+    in ("www.artstation.com" | "artstation.com"), username, *rest
       @username = username
 
     # https://sa-dui.artstation.com
     # https://hosi_na.artstation.com
+    # https://heyjay.artstation.com/store/art_posters
     in *rest unless subdomain.in?(RESERVED_SUBDOMAINS)
       @username = subdomain
 
@@ -54,7 +60,7 @@ class Source::URL::ArtStation < Source::URL
   end
 
   def image_url?
-    @file.present?
+    subdomain.starts_with?("cdn")
   end
 
   def full_image_url(size = "original")
diff --git a/test/unit/artist_url_test.rb b/test/unit/artist_url_test.rb
index d3d98714d..8300fb844 100644
--- a/test/unit/artist_url_test.rb
+++ b/test/unit/artist_url_test.rb
@@ -64,13 +64,17 @@ class ArtistURLTest < ActiveSupport::TestCase
     end
 
     should "normalize ArtStation urls" do
-      url = create(:artist_url, url: "https://www.artstation.com/koyorin")
+      url = create(:artist_url, url: "https://artstation.com/koyorin")
       assert_equal("https://www.artstation.com/koyorin", url.url)
       assert_equal("http://www.artstation.com/koyorin/", url.normalized_url)
 
       url = create(:artist_url, url: "https://koyorin.artstation.com")
       assert_equal("https://www.artstation.com/koyorin", url.url)
       assert_equal("http://www.artstation.com/koyorin/", url.normalized_url)
+
+      url = create(:artist_url, url: "https://www.artstation.com/artist/koyorin/albums/all/")
+      assert_equal("https://www.artstation.com/koyorin", url.url)
+      assert_equal("http://www.artstation.com/koyorin/", url.normalized_url)
     end
 
     should "normalize fc2 urls" do