diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80d5675dd..f8f2bb925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,7 @@ at anytime.
   *
 
 ### Removed
-  *
+  * `flags` decorator from server.py as short flags are no longer used when using api/cli methods
   *
 
 
diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py
index d83f0a118..7294d44aa 100644
--- a/lbrynet/daemon/Daemon.py
+++ b/lbrynet/daemon/Daemon.py
@@ -2730,7 +2730,6 @@ class Daemon(AuthJSONRPCServer):
 
     @AuthJSONRPCServer.auth_required
     @defer.inlineCallbacks
-    @AuthJSONRPCServer.flags(no_broadcast='--no_broadcast')
     def jsonrpc_wallet_prefill_addresses(self, num_addresses, amount, no_broadcast=False):
         """
         Create new addresses, each containing `amount` credits
diff --git a/lbrynet/daemon/auth/server.py b/lbrynet/daemon/auth/server.py
index 7a259de02..af08f8c46 100644
--- a/lbrynet/daemon/auth/server.py
+++ b/lbrynet/daemon/auth/server.py
@@ -149,15 +149,6 @@ class AuthorizedBase(object):
             return f
         return _deprecated_wrapper
 
-    @staticmethod
-    def flags(**kwargs):
-        def _flag_wrapper(f):
-            f._flags = {}
-            for k, v in kwargs.iteritems():
-                f._flags[v] = k
-            return f
-        return _flag_wrapper
-
 
 class AuthJSONRPCServer(AuthorizedBase):
     """Authorized JSONRPC server used as the base class for the LBRY API