diff --git a/modules/spamfilter/lang/en.php b/modules/spamfilter/lang/en.php
index d48382a60..2c5502287 100644
--- a/modules/spamfilter/lang/en.php
+++ b/modules/spamfilter/lang/en.php
@@ -64,3 +64,4 @@ $lang->recaptcha_target_every_time = 'Every Time';
 $lang->msg_recaptcha_connection_error = 'An error occurred while connecting to the reCAPTCHA verification server.';
 $lang->msg_recaptcha_server_error = 'An error occurred while verifying your reCAPTCHA response.';
 $lang->msg_recaptcha_invalid_response = 'Please check reCAPTCHA.';
+$lang->msg_recaptcha_keys_not_set = 'Please fill in your reCAPTCHA Site Key and Secret Key.';
diff --git a/modules/spamfilter/lang/ko.php b/modules/spamfilter/lang/ko.php
index 49c522392..8ad3b0c71 100644
--- a/modules/spamfilter/lang/ko.php
+++ b/modules/spamfilter/lang/ko.php
@@ -64,3 +64,4 @@ $lang->recaptcha_target_every_time = '매번 사용';
 $lang->msg_recaptcha_connection_error = 'reCAPTCHA 스팸방지 서버에 접속하는 도중 오류가 발생했습니다.';
 $lang->msg_recaptcha_server_error = 'reCAPTCHA 스팸방지 서버와 통신하는 도중 오류가 발생했습니다.';
 $lang->msg_recaptcha_invalid_response = 'reCAPTCHA 스팸방지 기능을 체크해 주십시오.';
+$lang->msg_recaptcha_keys_not_set = 'reCAPTCHA Site Key 및 Secret Key를 입력하여 주십시오.';
\ No newline at end of file
diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php
index 41fd421a8..7693e4315 100644
--- a/modules/spamfilter/spamfilter.admin.controller.php
+++ b/modules/spamfilter/spamfilter.admin.controller.php
@@ -80,6 +80,11 @@ class spamfilterAdminController extends spamfilter
 		$config->captcha->type = $vars->captcha_type === 'recaptcha' ? 'recaptcha' : 'none';
 		$config->captcha->site_key = escape(utf8_trim($vars->site_key));
 		$config->captcha->secret_key = escape(utf8_trim($vars->secret_key));
+		if ($config->captcha->type !== 'none' && (!$config->captcha->site_key || !$config->captcha->secret_key))
+		{
+			return new BaseObject(-1, 'msg_recaptcha_keys_not_set');
+		}
+		
 		$config->captcha->theme = escape(utf8_trim($vars->captcha_theme));
 		$config->captcha->size = escape(utf8_trim($vars->captcha_size));
 		$config->captcha->target_devices = [