diff --git a/onionshare/web.py b/onionshare/web.py
index 79c49e39..762e2342 100644
--- a/onionshare/web.py
+++ b/onionshare/web.py
@@ -266,7 +266,8 @@ class Web(object):
 
             r = make_response(render_template(
                 'receive.html',
-                slug=self.slug))
+                slug=self.slug,
+                receive_allow_receiver_shutdown=self.common.settings.get('receive_allow_receiver_shutdown')))
             return self.add_security_headers(r)
 
         @self.app.route("/<slug_candidate>/upload", methods=['POST'])
@@ -326,9 +327,13 @@ class Web(object):
         @self.app.route("/<slug_candidate>/close", methods=['POST'])
         def close(slug_candidate):
             self.check_slug_candidate(slug_candidate)
-            self.force_shutdown()
-            r = make_response(render_template('closed.html'))
-            return self.add_security_headers(r)
+            
+            if self.common.settings.get('receive_allow_receiver_shutdown'):
+                self.force_shutdown()
+                r = make_response(render_template('closed.html'))
+                return self.add_security_headers(r)
+            else:
+                return redirect('/{}'.format(slug_candidate))
 
     def common_routes(self):
         """
diff --git a/share/templates/receive.html b/share/templates/receive.html
index d1ec3b3a..7cc4319f 100644
--- a/share/templates/receive.html
+++ b/share/templates/receive.html
@@ -34,10 +34,10 @@
         </form>
       </div>
     </div>
-
+    {% if receive_allow_receiver_shutdown %}
     <form method="post" action="/{{ slug }}/close">
       <input type="submit" class="close-button" value="I'm Finished Uploading" />
     </form>
-
+    {% endif %}
   </body>
 </html>