diff --git a/arangod/Cache/Rebalancer.cpp b/arangod/Cache/Rebalancer.cpp
index 75ade4d94f..fbb263468e 100644
--- a/arangod/Cache/Rebalancer.cpp
+++ b/arangod/Cache/Rebalancer.cpp
@@ -33,5 +33,5 @@ int Rebalancer::rebalance() {
   if (_manager != nullptr) {
     return _manager->rebalance();
   }
-  return false;
+  return TRI_ERROR_INTERNAL;
 }
diff --git a/tests/Cache/TransactionsWithBackingStore.cpp b/tests/Cache/TransactionsWithBackingStore.cpp
index 1601810ada..3c72fe65cb 100644
--- a/tests/Cache/TransactionsWithBackingStore.cpp
+++ b/tests/Cache/TransactionsWithBackingStore.cpp
@@ -317,8 +317,8 @@ TEST_CASE("cache with backing store", "[cache][!hide][longRunning]") {
     bool doneRebalancing = false;
     auto rebalanceWorker = [&rebalancer, &doneRebalancing]() -> void {
       while (!doneRebalancing) {
-        bool rebalanced = rebalancer.rebalance();
-        if (rebalanced) {
+        int status = rebalancer.rebalance();
+        if (status != TRI_ERROR_ARANGO_BUSY) {
           std::this_thread::sleep_for(std::chrono::milliseconds(500));
         } else {
           std::this_thread::sleep_for(std::chrono::microseconds(100));