diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index a1a3a6bc..1828cee8 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -187,12 +187,8 @@ LOGOUT_URL = '/user/logout/'
 ACCOUNT_ACTIVATION_DAYS = 7
 
 # CAPTCHA settings
-if DEBUG or CI or env('HCAPTCHA_SITEKEY') is None:
-    HCAPTCHA_SITEKEY = '10000000-ffff-ffff-ffff-000000000001'
-    HCAPTCHA_SECRET = '0x0000000000000000000000000000000000000000'
-else:
-    HCAPTCHA_SITEKEY = env('HCAPTCHA_SITEKEY')
-    HCAPTCHA_SECRET = env('HCAPTCHA_SECRET')
+HCAPTCHA_SITEKEY = env('HCAPTCHA_SITEKEY', '10000000-ffff-ffff-ffff-000000000001')
+HCAPTCHA_SECRET = env('HCAPTCHA_SECRET', '0x0000000000000000000000000000000000000000')
 
 # Email
 EMAILER_TEST = False