diff --git a/app/models/project.rb b/app/models/project.rb
index 3c7287f..a7735a4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -158,7 +158,7 @@ class Project < ActiveRecord::Base
   end
 
   def last_activity
-    events.order("created_at DESC").first || nil
+    events.order("created_at ASC").last
   end
 
   def last_activity_date
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index b947eeb..5add7ff 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -141,7 +141,7 @@ describe Project do
     let(:last_event) { double }
 
     before do
-      project.stub(:events).and_return( [ double, double, last_event ] )
+      project.stub_chain(:events, :order).and_return( [ double, double, last_event ] )
     end
 
     it { project.last_activity.should == last_event }
--
libgit2 0.21.2