diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index ada51ae..be149f3 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -4,8 +4,7 @@ module RemoteStorage
   module Riak
 
     def client
-      return @client if @client
-      @client = ::Riak::Client.new(LiquorCabinet.config['riak'].symbolize_keys)
+      @client ||= ::Riak::Client.new(LiquorCabinet.config['riak'].symbolize_keys)
     end
 
     def authorize_request(user, category, token)