diff --git a/rq/job.py b/rq/job.py
index 9e9f207..8409eee 100644
--- a/rq/job.py
+++ b/rq/job.py
@@ -448,9 +448,13 @@ class Job(object):
         """Invokes the job function with the job arguments."""
         _job_stack.push(self.id)
         try:
-            self._result = self.func(*self.args, **self.kwargs)
+            self.set_status(Status.STARTED)
+            self._result = self.func(*self.args, **self.kwargs)            
+            self.set_status(Status.FINISHED)
+            self.ended_at = utcnow()        
         finally:
             assert self.id == _job_stack.pop()
+        
         return self._result
 
     def get_ttl(self, default_ttl=None):
diff --git a/rq/worker.py b/rq/worker.py
index 92d55bb..688b1a4 100644
--- a/rq/worker.py
+++ b/rq/worker.py
@@ -453,8 +453,7 @@ class Worker(object):
         """
 
         self.set_state('busy')
-        self.set_current_job_id(job.id)
-        job.set_status(Status.STARTED)
+        self.set_current_job_id(job.id)        
         self.heartbeat((job.timeout or 180) + 60)
         
         self.procline('Processing %s from %s since %s' % (
@@ -469,8 +468,7 @@ class Worker(object):
                 # Pickle the result in the same try-except block since we need to
                 # use the same exc handling when pickling fails
                 job._result = rv
-                job._status = Status.FINISHED
-                job.ended_at = utcnow()
+                
                 self.set_current_job_id(None, pipeline=pipeline)
 
                 result_ttl = job.get_ttl(self.default_result_ttl)