diff --git a/onedrive.php b/onedrive.php
index 53e33e2..f4c4451 100644
--- a/onedrive.php
+++ b/onedrive.php
@@ -199,7 +199,7 @@
 			<?php
 			if (isset($_GET['oid'])) $oid = $_GET['oid'];
 			
-			if (isset($oid) && !isset($rid) && !preg_match('/tenant/', $restoretype)) {
+			if (isset($oid) && !isset($rid)) {
 				if (strtolower($authtype) !== 'mfa' && $check === false && strtolower($administrator) === 'yes') {
 					$org = $veeam->getOrganizationByID($oid);
 				}
@@ -238,7 +238,7 @@
 			}
 			
 			if (!isset($_SESSION['rid'])) {
-				if (isset($oid) && !empty($oid)) {
+				if (isset($oid) && !empty($oid) && !preg_match('/tenant/', $restoretype)) {
 					$users = $veeam->getLicensedUsers($oid);
 					$repo = $veeam->getOrganizationRepository($oid);
 					$usersarray = array();
diff --git a/sharepoint.php b/sharepoint.php
index 9a081f6..f296dd7 100644
--- a/sharepoint.php
+++ b/sharepoint.php
@@ -238,7 +238,7 @@
 			<?php
 			if (isset($_GET['oid'])) $oid = $_GET['oid'];
 			
-			if (isset($oid) && !isset($rid) && !preg_match('/tenant/', $restoretype)) {
+			if (isset($oid) && !isset($rid)) {
 				if (strtolower($authtype) !== 'mfa' && $check === false && strtolower($administrator) === 'yes') {
 					$org = $veeam->getOrganizationByID($oid);
 				}
@@ -277,7 +277,7 @@
 			}
 			
 			if (!isset($_SESSION['rid'])) {
-				if (isset($oid) && !empty($oid)) {
+				if (isset($oid) && !empty($oid) && !preg_match('/tenant/', $restoretype)) {
 					$org = $veeam->getOrganizationByID($oid);
 					$repo = $veeam->getOrganizationRepository($oid);
 					
diff --git a/teams.php b/teams.php
index 7a69cbb..a26538e 100644
--- a/teams.php
+++ b/teams.php
@@ -173,7 +173,7 @@
 			<?php
 			if (isset($_GET['oid'])) $oid = $_GET['oid'];
 			
-			if (isset($oid) && !isset($rid) && !preg_match('/tenant/', $restoretype)) {
+			if (isset($oid) && !isset($rid)) {
 				if (strtolower($authtype) !== 'mfa' && $check === false && strtolower($administrator) === 'yes') {
 					$org = $veeam->getOrganizationByID($oid);
 				}
@@ -212,7 +212,7 @@
 			}
 			
 			if (!isset($_SESSION['rid'])) {
-				if (isset($oid) && !empty($oid)) {
+				if (isset($oid) && !empty($oid) && !preg_match('/tenant/', $restoretype)) {
 					$org = $veeam->getOrganizationByID($oid);
 					$repo = $veeam->getOrganizationRepository($oid);