diff --git a/lib/base.php b/lib/base.php
index a315ad13a04..70498f31567 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -716,6 +716,9 @@ class OC {
 				try {
 					$cache = new \OC\Cache\File();
 					$cache->gc();
+				} catch (\OC\ServerNotAvailableException $e) {
+					// not a GC exception, pass it on
+					throw $e;
 				} catch (\Exception $e) {
 					// a GC exception should not prevent users from using OC,
 					// so log the exception