diff --git a/courseware/modules/capa_module.py b/courseware/modules/capa_module.py
index 08cb81d7bd..366d0463e4 100644
--- a/courseware/modules/capa_module.py
+++ b/courseware/modules/capa_module.py
@@ -94,6 +94,10 @@ class Module(XModule):
         if self.max_attempts != None: 
             attempts_str = " ({a}/{m})".format(a=self.attempts, m=self.max_attempts)
 
+        # We don't need a "save" button if infinite number of attempts and non-randomized
+        if self.max_attempts == None and self.rerandomize == False:
+            save_button = False
+
         # Check if explanation is available, and if so, give a link
         explain=""
         if self.lcp.done and self.explain_available=='attempted':