diff --git a/setup.py b/setup.py
index 654d9bfb2..4decb0133 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@
     include_package_data=True,
     python_requires=">=3.7",
     packages=['thingsboard_gateway', 'thingsboard_gateway.gateway', 'thingsboard_gateway.gateway.proto', 'thingsboard_gateway.gateway.grpc_service',
-              'thingsboard_gateway.storage', 'thingsboard_gateway.storage.memory',
+              'thingsboard_gateway.storage', 'thingsboard_gateway.storage.memory', 'thingsboard_gateway.gateway.shell',
               'thingsboard_gateway.storage.file', 'thingsboard_gateway.storage.sqlite',
               'thingsboard_gateway.connectors', 'thingsboard_gateway.connectors.ble', 'thingsboard_gateway.connectors.socket',
               'thingsboard_gateway.connectors.mqtt',  'thingsboard_gateway.connectors.opcua_asyncio', 'thingsboard_gateway.connectors.xmpp',
@@ -72,6 +72,7 @@
     entry_points={
         'console_scripts': [
             'thingsboard-gateway = thingsboard_gateway.tb_gateway:daemon',
-            'tb-gateway-configurator = thingsboard_gateway.gateway.configuration_wizard:configure'
+            'tb-gateway-configurator = thingsboard_gateway.gateway.configuration_wizard:configure',
+            'tb-gateway-shell = thingsboard_gateway.gateway.shell:main'
         ]
     })
diff --git a/thingsboard_gateway/gateway/shell/shell.py b/thingsboard_gateway/gateway/shell/shell.py
index a70cfd780..e04924a37 100644
--- a/thingsboard_gateway/gateway/shell/shell.py
+++ b/thingsboard_gateway/gateway/shell/shell.py
@@ -211,5 +211,9 @@ def do_EOF(self, args):
         return self.do_exit(args)
 
 
+def main():
+    Shell()
+
+
 if __name__ == '__main__':
     shell = Shell()