diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2baffa1a..2364ea97 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -163,6 +163,7 @@ class ProjectsController < ApplicationController
   end
   
   def destroy
+    @project.recurring_todos.each {|rt| rt.remove_from_project!}
     @project.destroy
     @active_projects_count = current_user.projects.active.count
     @hidden_projects_count = current_user.projects.hidden.count
diff --git a/app/models/context.rb b/app/models/context.rb
index 41d27a53..a7d79f72 100644
--- a/app/models/context.rb
+++ b/app/models/context.rb
@@ -1,6 +1,7 @@
 class Context < ActiveRecord::Base
 
   has_many :todos, :dependent => :delete_all, :include => :project, :order => "todos.completed_at DESC"
+  has_many :recurring_todos, :dependent => :delete_all
   belongs_to :user
 
   named_scope :active, :conditions => { :hide => false }
diff --git a/app/models/project.rb b/app/models/project.rb
index 88053a1c..20a75f97 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -27,6 +27,7 @@ class Project < ActiveRecord::Base
     :order => "show_from"
 
   has_many :notes, :dependent => :delete_all, :order => "created_at DESC"
+  has_many :recurring_todos
 
   belongs_to :default_context, :class_name => "Context", :foreign_key => "default_context_id"
   belongs_to :user
diff --git a/app/models/recurring_todo.rb b/app/models/recurring_todo.rb
index 353ce0ca..23541dbc 100644
--- a/app/models/recurring_todo.rb
+++ b/app/models/recurring_todo.rb
@@ -639,6 +639,11 @@ class RecurringTodo < ActiveRecord::Base
     starred?  
   end
   
+  def remove_from_project!
+    self.project = nil
+    self.save
+  end
+
   def inc_occurences
     self.occurences_count += 1
     self.save