diff --git a/src/ejabberd_riak.erl b/src/ejabberd_riak.erl
index 07dbf3a87..25cb2792e 100644
--- a/src/ejabberd_riak.erl
+++ b/src/ejabberd_riak.erl
@@ -30,7 +30,7 @@
 -export([start_link/4, get_proc/1, make_bucket/1, put/1, put/2,
          get/1, get/2, get_by_index/3, delete/1, delete/2,
          count_by_index/3, get_by_index_range/4,
-         get_keys/1, get_keys_by_index/3,
+         get_keys/1, get_keys_by_index/3, is_connected/0,
          count/1, delete_by_index/3]).
 %% For debugging
 -export([get_tables/0]).
@@ -64,6 +64,10 @@
 start_link(Num, Server, Port, _StartInterval) ->
     gen_server:start_link({local, get_proc(Num)}, ?MODULE, [Server, Port], []).
 
+%% @private
+is_connected() ->
+    catch riakc_pb_socket:is_connected(get_random_pid()).
+
 %% @private
 get_proc(I) ->
     jlib:binary_to_atom(