diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
index 7fcbabfcc..20b0255a0 100644
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -151,28 +151,30 @@ app.controller('BoardController', function ($rootScope, $scope, $element, $state
 		}
 	});
 
-	const ComponentVM = new Vue({
-		render: h => h(CollaborationView),
-		data: {
-			model: BoardService.getCurrent()
-		},
-	});
-	$scope.mountCollections = function() {
-		const MountingPoint = document.getElementById('collaborationResources');
-		if (MountingPoint) {
+	if (parseInt(oc_config.version.split('.')[0]) >= 16) {
+		const ComponentVM = new Vue({
+			render: h => h(CollaborationView),
+			data: {
+				model: BoardService.getCurrent()
+			},
+		});
+		$scope.mountCollections = function () {
+			const MountingPoint = document.getElementById('collaborationResources');
+			if (MountingPoint) {
+				ComponentVM.model = BoardService.getCurrent();
+				ComponentVM.$mount(MountingPoint);
+			}
+		};
+		$scope.$$postDigest($scope.mountCollections);
+		$scope.$watch(function () {
+			return BoardService.getCurrent();
+		}, function () {
 			ComponentVM.model = BoardService.getCurrent();
-			ComponentVM.$mount(MountingPoint);
-		}
-	};
-	$scope.$$postDigest($scope.mountCollections);
-	$scope.$watch(function () {
-		return BoardService.getCurrent();
-	}, function() {
-		ComponentVM.model = BoardService.getCurrent();
-		if ($scope.sidebar.show) {
-			$scope.$$postDigest($scope.mountCollections);
-		}
-	});
+			if ($scope.sidebar.show) {
+				$scope.$$postDigest($scope.mountCollections);
+			}
+		});
+	}
 
 	$scope.toggleCompactMode = function() {
 		$rootScope.compactMode = !$rootScope.compactMode;
diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php
index 92390f325..2a815fe01 100644
--- a/lib/Service/PermissionService.php
+++ b/lib/Service/PermissionService.php
@@ -83,7 +83,8 @@ class PermissionService {
 		$this->config = $config;
 		$this->userId = $userId;
 
-		$this->circlesEnabled = \OC::$server->getAppManager()->isEnabledForUser('circles');
+		$this->circlesEnabled = \OC::$server->getAppManager()->isEnabledForUser('circles') &&
+			(version_compare(\OC::$server->getAppManager()->getAppVersion('circles'), '0.17.1') >= 0);
 	}
 
 	/**