diff --git a/catalogue/RdbmsCatalogue.cpp b/catalogue/RdbmsCatalogue.cpp
index b863041eb4ddecd9910e3d60e0568838c08731d1..72f2f23b51fb417f3785009c012dddf0af87d51c 100644
--- a/catalogue/RdbmsCatalogue.cpp
+++ b/catalogue/RdbmsCatalogue.cpp
@@ -1731,9 +1731,7 @@ std::list<common::dataStructures::Tape> RdbmsCatalogue::getTapes(rdbms::PooledCo
         "LAST_UPDATE_HOST_NAME AS LAST_UPDATE_HOST_NAME,"
         "LAST_UPDATE_TIME AS LAST_UPDATE_TIME "
       "FROM "
-        "TAPE "
-      "ORDER BY "
-        "VID";
+        "TAPE";
 
     if(searchCriteria.vid||
        searchCriteria.logicalLibrary||
@@ -1781,6 +1779,8 @@ std::list<common::dataStructures::Tape> RdbmsCatalogue::getTapes(rdbms::PooledCo
       sql += " LBP_IS_ON = :LBP_IS_ON";
     }
 
+    sql += " ORDER BY VID";
+
     auto stmt = conn.createStmt(sql, rdbms::Stmt::AutocommitMode::OFF);
 
     if(searchCriteria.vid) stmt->bindString(":VID", searchCriteria.vid.value());