diff --git a/proxy/__main__.py b/proxy/__main__.py
index d04d8529d..18c95ec59 100644
--- a/proxy/__main__.py
+++ b/proxy/__main__.py
@@ -8,7 +8,26 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
+
 from .proxy import entry_point
+import os
+from .indexer.airdropper import run_airdropper
 
 if __name__ == '__main__':
-    entry_point()
+    airdropper_mode = os.environ.get('AIRDROPPER_MODE', 'False').lower() in [1, 'true', 'True']
+    if airdropper_mode:
+        print("Will run in airdropper mode")
+        solana_url = os.environ['SOLANA_URL']
+        evm_loader_id = os.environ['EVM_LOADER']
+        faucet_url = os.environ['FAUCET_URL']
+        wrapper_whitelist = os.environ['INDEXER_ERC20_WRAPPER_WHITELIST'].split(',')
+        airdrop_amount = int(os.environ['AIRDROP_AMOUNT'])
+        log_level = os.environ['LOG_LEVEL']
+        run_airdropper(solana_url,
+                       evm_loader_id,
+                       faucet_url,
+                       wrapper_whitelist,
+                       airdrop_amount,
+                       log_level)
+    else:
+        entry_point()
diff --git a/proxy/indexer/airdropper.py b/proxy/indexer/airdropper.py
index 12353fe09..41c638cc6 100644
--- a/proxy/indexer/airdropper.py
+++ b/proxy/indexer/airdropper.py
@@ -157,19 +157,3 @@ def run_airdropper(solana_url,
                             airdrop_amount,
                             log_level)
     airdropper.run()
-
-
-if __name__ == "__main__":
-    solana_url = os.environ.get('SOLANA_URL', 'http://localhost:8899')
-    evm_loader_id = os.environ.get('EVM_LOADER_ID', '53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io')
-    faucet_url = os.environ.get('FAUCET_URL', 'http://localhost:3333')
-    wrapper_whitelist = os.environ.get('INDEXER_ERC20_WRAPPER_WHITELIST', '').split(',')
-    airdrop_amount = os.environ.get('AIRDROP_AMOUNT', 0)
-    log_level = os.environ.get('LOG_LEVEL', 'INFO')
-
-    run_airdropper(solana_url,
-                   evm_loader_id,
-                   faucet_url,
-                   wrapper_whitelist,
-                   airdrop_amount,
-                   log_level)