diff --git a/app/controllers/completions_controller.rb b/app/controllers/completions_controller.rb
index a528ac6..f39abf1 100644
--- a/app/controllers/completions_controller.rb
+++ b/app/controllers/completions_controller.rb
@@ -19,6 +19,7 @@ class CompletionsController < ApplicationController
     if params[:contestant_id]
       @completion.contestant_id = params[:contestant_id]
     end
+    @completion.contest = @contest
   end
 
   def create
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index e4c5889..1b7d605 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -82,6 +82,7 @@ class MessagesController < ApplicationController
     @completion = Completion.new()
     @completion.display_time_from_start = @message.display_time
     @completion.completed = true
+    @completion.contest = @contest
 
     render "completions/new"
   end
diff --git a/app/views/completions/_form.html.slim b/app/views/completions/_form.html.slim
index 341fe40..9df454e 100644
--- a/app/views/completions/_form.html.slim
+++ b/app/views/completions/_form.html.slim
@@ -118,7 +118,7 @@
         .form-floating
           = form.text_field :display_time_from_start, autocomplete: "off", class: "form-control", id: "time"
           = form.label :display_time_from_start, class: "required"
-      - unless method == :patch || @contest.start_time == nil
+      - unless method == :patch || @contest.start_time == nil || @message
         .col.mt-2
           a.btn.btn-primary id="refresh" style="display: #{@completion.completed ? "" : "none"}"
             = t("helpers.buttons.refresh")
@@ -126,7 +126,7 @@
         = t("activerecord.attributes.completion.display_time_from_start_description")
       
     / Refresh logic.
-    - if @contest.start_time.present? && method != :patch
+    - if @contest.start_time.present? && method != :patch && !@message
       javascript:
         startTime = #{@contest.start_time.present? ? @contest.start_time.to_i : "null"};
         pauseTime = #{@contest.pause_time.present? ? @contest.pause_time.to_i : "null"};