diff --git a/modules/recaptcha/modules.php b/modules/recaptcha/modules.php
index c990f4a6ac..8981c62f2e 100644
--- a/modules/recaptcha/modules.php
+++ b/modules/recaptcha/modules.php
@@ -43,7 +43,7 @@ public function process() {
  */
 class Hm_Output_recaptcha_script extends Hm_Output_Module {
     protected function output() {
-        if (!$this->get('router_login_state')) {
+        if (!$this->get('router_login_state') && $this->get('recaptcha_config')) {
             return "<script src='https://www.google.com/recaptcha/api.js'></script>";
         }
     }
@@ -54,9 +54,8 @@ protected function output() {
  */
 class Hm_Output_recaptcha_form extends Hm_Output_Module {
     protected function output() {
-        if (!$this->get('router_login_state')) {
-            $rconf = $this->get('recaptcha_config');
-            return '<div class="g-recaptcha" data-sitekey="'.$this->html_safe($rconf['site_key']).'"></div>';
+        if (!$this->get('router_login_state') && $recaptcha_config = $this->get('recaptcha_config')) {
+            return '<div class="g-recaptcha" data-sitekey="'.$this->html_safe($recaptcha_config['site_key']).'"></div>';
         }
     }
 }
diff --git a/modules/recaptcha/recaptcha.ini b/modules/recaptcha/recaptcha.ini
deleted file mode 100644
index 82d11502ad..0000000000
--- a/modules/recaptcha/recaptcha.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-; Constants used for Recaptcha
-;
-; https://developers.google.com/recaptcha/
-;
-; Once you edit this file, you must move it to the directory defined by
-; app_data_dir in your config/app.php file. No need to re-run the
-; config_gen.php script.
-;
-; SECURITY ALERT ! MAKE SURE THAT THIS FILE IS NOT ACCESSIBLE BY THE BROWSER !
-
-; Client secret for the recaptcha admin
-secret=""
-
-; Site key from the recaptcha admin
-site_key=""