diff --git a/src/static/riot/competitions/detail/submission_limit.tag b/src/static/riot/competitions/detail/submission_limit.tag
index 657e287c8..c0e62d922 100644
--- a/src/static/riot/competitions/detail/submission_limit.tag
+++ b/src/static/riot/competitions/detail/submission_limit.tag
@@ -1,4 +1,5 @@
 <submission-limit>
+
     <div class="ui sixteen wide column submission-container">
         <div class="col">
             <div class="col-content">
@@ -7,19 +8,30 @@
                     <i class="grey question circle icon"></i>
                 </a>
             </div>
-            <span if="{selected_phase.max_submissions_per_day}" class="badge {badgeColor(selected_phase.used_submissions_per_day, selected_phase.max_submissions_per_day)}">
+            <!-- Badge for when there is a limit -->
+            <span if="{selected_phase.max_submissions_per_day > 0}" class="badge {badgeColor(selected_phase.used_submissions_per_day, selected_phase.max_submissions_per_day)}">
                 {selected_phase.used_submissions_per_day} out of {selected_phase.max_submissions_per_day}
             </span>
+            <!-- Badge for when there is no limit -->
+            <span if="{selected_phase.max_submissions_per_day == 0}" class="badge badge-green">
+                {selected_phase.used_submissions_per_day} out of ∞
+            </span>
         </div>
         <div class="col">
             <div class="col-content">
                 Number of total submissions used
             </div>
-            <span if="{selected_phase.max_submissions_per_person}" class="badge {badgeColor(selected_phase.used_submissions_per_person, selected_phase.max_submissions_per_person)}">
+            <!-- Badge for when there is a limit -->
+            <span if="{selected_phase.max_submissions_per_person > 0}" class="badge {badgeColor(selected_phase.used_submissions_per_person, selected_phase.max_submissions_per_person)}">
                 {selected_phase.used_submissions_per_person} out of {selected_phase.max_submissions_per_person}
             </span>
+            <!-- Badge for when there is no limit -->
+            <span if="{selected_phase.max_submissions_per_person == 0}" class="badge badge-green">
+                {selected_phase.used_submissions_per_person} out of ∞
+            </span>
         </div>
     </div>
+
     <script>
         var self = this;
         self.selected_phase = {}