diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 97082402b..4379ee011 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -125,10 +125,13 @@ class Grav extends Container
                             }
                         }
                         Utils::download($medium->path(), false);
-                    } else {
+                    }
+
+                    // has an extension, try to download it...
+                    if (isset($path_parts['extension'])) {
                         $download = true;
                         // little work-around to ensure .css and .js files are always sent inline not downloaded
-                        if (Utils::endsWith($uri->basename(), ['.css', '.js'])) {
+                        if (in_array($path_parts['extension'], ['.css', '.js'])) {
                             $download = false;
                         }
                         Utils::download($page->path() . DIRECTORY_SEPARATOR . $uri->basename(), $download);