diff --git a/app/models/project.rb b/app/models/project.rb
index f85c6a65858..3306fb86282 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -465,7 +465,7 @@ class Project < ActiveRecord::Base
 
     import_url = Gitlab::UrlSanitizer.new(value)
     super(import_url.sanitized_url)
-    create_or_update_import_data(credentials: import_url.credentials) unless errors.messages[:import_url]
+    create_or_update_import_data(credentials: import_url.credentials) if valid_import_url?
   end
 
   def import_url
@@ -477,6 +477,10 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def valid_import_url?
+    valid? || errors.messages[:import_url].nil?
+  end
+
   def create_or_update_import_data(data: nil, credentials: nil)
     project_import_data = import_data || build_import_data
     if data