diff --git a/app/controllers/api/v2/tokens_controller.rb b/app/controllers/api/v2/tokens_controller.rb
index e0474e25..92a2cfbc 100644
--- a/app/controllers/api/v2/tokens_controller.rb
+++ b/app/controllers/api/v2/tokens_controller.rb
@@ -18,6 +18,12 @@ module Api
         create_action
         respond_with_resource
       end
+
+      private
+
+      def current_user
+        token_user || doorkeeper_user || super
+      end
     end
   end
 end