diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
index da7fa2c69..9bf7efcfe 100644
--- a/src/ejabberd_http.erl
+++ b/src/ejabberd_http.erl
@@ -891,8 +891,8 @@ normalize_path([Part | Path], Norm) ->
 -spec get_certfile([proplists:property()]) -> binary() | undefined.
 get_certfile(Opts) ->
     case lists:keyfind(certfile, 1, Opts) of
-	{_, _CertFile} ->
-	    undefined;
+	{_, CertFile} ->
+	    CertFile;
 	false ->
 	    case ejabberd_pkix:get_certfile(?MYNAME) of
 		{ok, CertFile} ->