diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index 1c9e1e084dd..1ea74a69f79 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -73,7 +73,11 @@ def target_users
   end
 
   def set_user
-    @user = User.find(params[:id])
+    @user = if params[:id] == 'show'
+              User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
+            else
+              User.find(params[:id])
+            end
   end
 
   def user_params