diff --git a/pyghmi/ipmi/oem/lenovo/handler.py b/pyghmi/ipmi/oem/lenovo/handler.py
index 199dc5c3..0f32f1df 100755
--- a/pyghmi/ipmi/oem/lenovo/handler.py
+++ b/pyghmi/ipmi/oem/lenovo/handler.py
@@ -165,7 +165,6 @@ class OEMHandler(generic.OEMHandler):
             self.tsmahandler.set_credentials(
                 ipmicmd.ipmi_session.userid.decode('utf-8'),
                 ipmicmd.ipmi_session.password.decode('utf-8'))
-            self.tsmahandler.init_redfish()
 
     @property
     def _megarac_eth_index(self):
diff --git a/pyghmi/redfish/oem/lenovo/tsma.py b/pyghmi/redfish/oem/lenovo/tsma.py
index d16c74a4..52db9b15 100644
--- a/pyghmi/redfish/oem/lenovo/tsma.py
+++ b/pyghmi/redfish/oem/lenovo/tsma.py
@@ -85,17 +85,24 @@ class TsmHandler(generic.OEMHandler):
         self.csrftok = None
         self.isipmi = bool(fish)
         self.fish = fish
+        self.fishclient = None
         super(TsmHandler, self).__init__(sysinfo, sysurl, webclient, cache)
         self.tsm = webclient.thehost
         self._certverify = webclient._certverify
 
     def clear_uefi_configuration(self):
+        if not self.fishclient:
+            self.init_redfish()
         return self.fishclient.clear_system_configuration()
 
     def get_uefi_configuration(self, hideadvanced=True):
+        if not self.fishclient:
+            self.init_redfish()
         return self.fishclient.get_system_configuration(hideadvanced)
 
     def set_uefi_configuration(self, changeset):
+        if not self.fishclient:
+            self.init_redfish()
         return self.fishclient.set_system_configuration(changeset)
 
     def get_diagnostic_data(self, savefile, progress=None, autosuffix=False):