1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/group_import_state.rb b/app/models/group_import_state.rb
index 7773b887249..d22c1ac5550 100644
--- a/app/models/group_import_state.rb
+++ b/app/models/group_import_state.rb
@@ -5,7 +5,8 @@ class GroupImportState < ApplicationRecord
 
   belongs_to :group, inverse_of: :import_state
 
-  validates :group, :status, :jid, presence: true
+  validates :group, :status, presence: true
+  validates :jid, presence: true, if: -> { started? || finished? }
 
   state_machine :status, initial: :created do
     state :created, value: 0
@@ -31,4 +32,8 @@ class GroupImportState < ApplicationRecord
       state.update_column(:last_error, last_error) if last_error
     end
   end
+
+  def in_progress?
+    created? || started?
+  end
 end