diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
index 992a06ca656298737acf807098becf8607b555c1..737e30099508d7f3ef2dacc2247196817ff6dac6 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
@@ -274,10 +274,9 @@ void RecallTaskInjector::WorkerThread::run()
       LogContext::ScopedParam sp(m_parent.m_lc, Param("maxSupportedUDS", m_parent.m_raoManager.getMaxFilesSupported().value()));
       m_parent.m_lc.log(cta::log::INFO,"Query getLimitUDS for RAO Enterprise completed");
     } catch (castor::tape::SCSI::Exception& e) {
-      m_parent.m_raoManager.disableRAO();
       cta::log::ScopedParamContainer spc(m_parent.m_lc);
       spc.add("exceptionMessage",e.getMessageValue());
-      m_parent.m_lc.log(cta::log::ERR, "Error while fetching the limitUDS for RAO enterprise drive.");
+      m_parent.m_lc.log(cta::log::ERR, "Error while fetching the limitUDS for RAO enterprise drive. Will run a CTA RAO.");
     } catch(const castor::tape::tapeserver::drive::DriveDoesNotSupportRAOException &ex){
       m_parent.m_lc.log(cta::log::INFO, "The drive does not support RAO Enterprise, will run a CTA RAO.");
     }
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
index 41bb4018e453d70a97e316f99eb7d0878fa2162b..973e618405fc6558f647a84b7d401fb129e0b3db 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
@@ -118,10 +118,6 @@ void drive::DriveLTO::clearCompressionStats() {
   SCSI::ExceptionLauncher(sgh, "SCSI error in clearCompressionStats:");
 }
 
-SCSI::Structures::RAO::udsLimits drive::DriveLTO::getLimitUDS() {
-  throw castor::tape::tapeserver::drive::DriveDoesNotSupportRAOException("Drive does not support RAO enterprise.");
-}
-
 /**
  * Information about the drive. The vendor id is used in the user labels of the files.
  * @return    The deviceInfo structure with the information about the drive.
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp
index fef9ab0672e69649cf99bf2b19fdb08e0f3c2a01..aca50c509e0312b03b1240f1ca852943bf7819ec 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp
@@ -595,7 +595,6 @@ namespace drive {
     virtual compressionStats getCompression();
     virtual void clearCompressionStats();
     virtual std::vector<castor::tape::tapeserver::drive::endOfWrapPosition> getEndOfWrapPositions();
-    virtual SCSI::Structures::RAO::udsLimits getLimitUDS();
   };
 
   class DriveIBM3592 : public DriveGeneric {