diff --git a/lib/rake/task.rb b/lib/rake/task.rb
index 80824f37b..ec2c756e0 100644
--- a/lib/rake/task.rb
+++ b/lib/rake/task.rb
@@ -146,6 +146,7 @@ def arg_names
     # is invoked again.
     def reenable
       @already_invoked = false
+      @invocation_exception = nil
     end
 
     # Clear the existing prerequisites, actions, comments, and arguments of a rake task.
diff --git a/test/test_rake_task.rb b/test/test_rake_task.rb
index 688e0a3e7..fa4099b07 100644
--- a/test/test_rake_task.rb
+++ b/test/test_rake_task.rb
@@ -117,6 +117,33 @@ def test_can_double_invoke_with_reenable
     assert_equal ["t1", "t1"], runlist
   end
 
+  def test_can_triple_invoke_after_exception_with_reenable
+    raise_exception = true
+    invoked         = 0
+
+    t1 = task(:t1) do |t|
+      invoked += 1
+      next if !raise_exception
+
+      raise_exception = false
+      raise 'Some error'
+    end
+
+    assert_raises(RuntimeError) { t1.invoke }
+    assert_equal 1, invoked
+
+    t1.reenable
+
+    # actually invoke second time
+    t1.invoke
+    assert_equal 2, invoked
+
+    # recognize already invoked and
+    # don't raise pre-reenable exception
+    t1.invoke
+    assert_equal 2, invoked
+  end
+
   def test_clear
     desc "a task"
     t = task("t", ["b"] => "a") {}