diff --git a/templates/_captcha.html b/templates/_captcha.html
index 5d9363bc..ddf0680e 100644
--- a/templates/_captcha.html
+++ b/templates/_captcha.html
@@ -1,4 +1,5 @@
 {{define "captcha"}}
+{{with .Upload}}
 	{{/* unset if user doesn't need captcha */}}
 	{{if ne .CaptchaID ""}}
 	<div class="form-group captcha-container">
@@ -9,3 +10,4 @@
 	</div>
 	{{end}}
 {{end}}
+{{end}}
diff --git a/templates/upload.html b/templates/upload.html
index 5472c31b..54d61360 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -78,7 +78,7 @@
           <input name="website_link" id="website_link" class="form-control" type="text" value="{{.WebsiteLink}}">
       </div>
 
-      {{block "captcha" .}}{{end}}
+      {{block "captcha" $}}{{end}}
 
       <button type="submit" class="btn btn-success">{{call $.T "upload"}}</button>
       <br />