diff --git a/lib/travis/api/v3/queries/cron.rb b/lib/travis/api/v3/queries/cron.rb
index 80ac2108..43d3cb5f 100644
--- a/lib/travis/api/v3/queries/cron.rb
+++ b/lib/travis/api/v3/queries/cron.rb
@@ -12,5 +12,10 @@ module Travis::API::V3
     def find_for_branch(branch)
       branch.cron
     end
+
+    def create(branch, interval, disable_by_build)
+      branch.cron.destroy unless branch.cron.nil?
+      Models::Cron.create(branch: branch, interval: interval, disable_by_build: disable_by_build)
+    end
   end
 end
diff --git a/lib/travis/api/v3/services/cron/create.rb b/lib/travis/api/v3/services/cron/create.rb
index c7ce0c03..32f245f3 100644
--- a/lib/travis/api/v3/services/cron/create.rb
+++ b/lib/travis/api/v3/services/cron/create.rb
@@ -12,12 +12,10 @@ module Travis::API::V3
 
       if branch.cron
         access_control.permissions(branch.cron).delete!
-        branch.cron.destroy
       end
 
-      Models::Cron.create(branch: branch,
-                          interval: params["interval"],
-                          disable_by_build: params["disable_by_build"] ? params["disable_by_build"] : false)
+      query.create(branch, params["interval"], params["disable_by_build"] ? params["disable_by_build"] : false)
+
     end
 
   end