diff --git a/cinder/rpc.py b/cinder/rpc.py
index 4016e74535c..11de4f0bd67 100644
--- a/cinder/rpc.py
+++ b/cinder/rpc.py
@@ -199,7 +199,7 @@ class RPCAPI(object):
                 return version
         return versions[-1]
 
-    def _get_cctxt(self, host=None, version=None, **kwargs):
+    def _get_cctxt(self, version=None, **kwargs):
         """Prepare client context
 
         Version parameter accepts single version string or tuple of strings.
diff --git a/cinder/volume/rpcapi.py b/cinder/volume/rpcapi.py
index 01b7e7dc309..2a0bb3feaee 100644
--- a/cinder/volume/rpcapi.py
+++ b/cinder/volume/rpcapi.py
@@ -117,10 +117,10 @@ class VolumeAPI(rpc.RPCAPI):
     TOPIC = constants.VOLUME_TOPIC
     BINARY = 'cinder-volume'
 
-    def _get_cctxt(self, host=None, **kwargs):
+    def _get_cctxt(self, host=None, version=None, **kwargs):
         if host is not None:
             kwargs['server'] = utils.get_volume_rpc_host(host)
-        return super(VolumeAPI, self)._get_cctxt(**kwargs)
+        return super(VolumeAPI, self)._get_cctxt(version, **kwargs)
 
     def create_consistencygroup(self, ctxt, group, host):
         cctxt = self._get_cctxt(host)