diff --git a/lib/active_record/tasks/chronomodel_database_tasks.rb b/lib/active_record/tasks/chronomodel_database_tasks.rb
index c484f66b..c88944c5 100644
--- a/lib/active_record/tasks/chronomodel_database_tasks.rb
+++ b/lib/active_record/tasks/chronomodel_database_tasks.rb
@@ -18,7 +18,7 @@ def structure_dump(*arguments)
         sql = File.read(filename).gsub(/CREATE SCHEMA (?!IF NOT EXISTS)/, '\&IF NOT EXISTS ')
         File.open(filename, 'w') { |file| file << sql }
 
-        remove_sql_header_comments(filename)
+        remove_sql_header_comments(filename) if ActiveRecord::VERSION::STRING < '5.1'
       end
 
       def data_dump(target)
diff --git a/spec/aruba/rake_task_spec.rb b/spec/aruba/rake_task_spec.rb
index 06dcf13f..d939a93f 100644
--- a/spec/aruba/rake_task_spec.rb
+++ b/spec/aruba/rake_task_spec.rb
@@ -21,6 +21,7 @@
 
     it { expect(last_command_started).to be_successfully_executed }
     it { expect('db/test.sql').to be_an_existing_file }
+    it { expect('db/test.sql').not_to have_file_content(/\A--/) }
   end
 
   describe 'db:schema:load' do