diff --git a/cogs/economy.py b/cogs/economy.py
index 9b1eee255..289dbc07f 100644
--- a/cogs/economy.py
+++ b/cogs/economy.py
@@ -454,11 +454,14 @@ class Economy:
     async def leaderboard(self, ctx):
         """Server / global leaderboard
 
-        Defaults to server"""
+        Defaults to \"server\" if not issued in DM"""
         if ctx.invoked_subcommand is None:
-            await ctx.invoke(self._server_leaderboard)
+            if ctx.message.server:
+                await ctx.invoke(self._server_leaderboard)
+            else:
+                await ctx.invoke(self._global_leaderboard)
 
-    @leaderboard.command(name="server", pass_context=True)
+    @leaderboard.command(name="server", pass_context=True, no_pm=True)
     async def _server_leaderboard(self, ctx, top: int=10):
         """Prints out the server's leaderboard