diff --git a/KerbalStuff/blueprints/mods.py b/KerbalStuff/blueprints/mods.py
index f9eea342..1402448e 100644
--- a/KerbalStuff/blueprints/mods.py
+++ b/KerbalStuff/blueprints/mods.py
@@ -480,14 +480,16 @@ def _allow_download(mod: Mod) -> bool:
 
 
 @mods.route('/mod/<int:mod_id>/download/<version>', defaults={'mod_name': None})
+@mods.route('/mod/<int:mod_id>/download', defaults={'mod_name': None, 'version': None})
+@mods.route('/mod/<int:mod_id>/<path:mod_name>/download', defaults={'version': None})
 @mods.route('/mod/<int:mod_id>/<path:mod_name>/download/<version>')
 @with_session
-def download(mod_id: int, mod_name: str, version: str) -> Optional[werkzeug.wrappers.Response]:
+def download(mod_id: int, mod_name: Optional[str], version: Optional[str]) -> Optional[werkzeug.wrappers.Response]:
     mod, game = _get_mod_game_info(mod_id)
     if not _allow_download(mod):
         abort(401)
-    mod_version = ModVersion.query.filter(ModVersion.mod_id == mod_id,
-                                          ModVersion.friendly_version == version).first()
+    mod_version = mod.default_version if not version or version == 'download' \
+        else next(filter(lambda v: v.friendly_version == version, mod.versions), None)
     if not mod_version:
         abort(404)
     download = DownloadEvent.query\
diff --git a/templates/mod.html b/templates/mod.html
index 02b93820..cb506498 100644
--- a/templates/mod.html
+++ b/templates/mod.html
@@ -57,7 +57,7 @@ <h1 title="{{ mod.name }}">
         </div>
         <div class="{% if user %}col-md-2{% else %}col-md-4{% endif %}">
             <a  class="btn btn-block btn-lg btn-primary piwik_download" id="download-link-primary"
-                href="{{ url_for("mods.download", mod_id=mod.id, mod_name=mod.name, version=latest.friendly_version) }}">
+                href="{{ url_for("mods.download", mod_id=mod.id, mod_name=mod.name) }}">
                 Download {% if latest.id in size_versions and size_versions[latest.id] is not none %} ({{ size_versions[latest.id] }}) {% endif %}</a>
         </div>
         {% if user %}
diff --git a/templates/mod_list.html b/templates/mod_list.html
index 8d6967d9..9cbcccab 100644
--- a/templates/mod_list.html
+++ b/templates/mod_list.html
@@ -69,7 +69,7 @@ <h3>
                 {% endif %}
             </div>
             <div class="col-md-8">
-                <a href="{{ url_for("mods.download", mod_name=mod.name, mod_id=mod.id, version=mod.default_version.friendly_version) }}" class="btn btn-block btn-lg btn-primary">Download</a>
+                <a href="{{ url_for("mods.download", mod_name=mod.name, mod_id=mod.id) }}" class="btn btn-block btn-lg btn-primary">Download</a>
             </div>
         </div>
     </div>