diff --git a/app/controllers/socializer/likes_controller.rb b/app/controllers/socializer/likes_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/socializer/likes_controller.rb
+++ b/app/controllers/socializer/likes_controller.rb
@@ -1,6 +1,7 @@
 module Socializer
   class LikesController < ApplicationController
-    before_action :set_likable, only: [:create, :destroy]
+    before_action :set_likable,  only: [:create, :destroy]
+    before_action :set_activity, only: [:create, :destroy]
 
     # REFACTOR: should handle activity/tooltip as well as people likes
     # Used to display the Like tooltip
@@ -19,7 +20,6 @@ module Socializer
 
     def create
       @likable.like!(current_user) unless current_user.likes?(@likable)
-      @activity = @likable.activitable
 
       respond_to do |format|
         format.js
@@ -28,7 +28,6 @@ module Socializer
 
     def destroy
       @likable.unlike!(current_user) if current_user.likes?(@likable)
-      @activity = @likable.activitable
 
       respond_to do |format|
         format.js
@@ -42,6 +41,10 @@ module Socializer
       @likable = ActivityObject.find(params[:id])
     end
 
+    def set_activity
+      @activity = @likable.activitable
+    end
+
       # # Never trust parameters from the scary internet, only allow the white list through.
       # def like_params
       #   params.require(:like).permit(:actor_id, :activity_object_id)
dry @activity for likes_controller