diff --git a/app/config/collections/platform.php b/app/config/collections/platform.php
index ce8be6a874..e53194c513 100644
--- a/app/config/collections/platform.php
+++ b/app/config/collections/platform.php
@@ -1148,7 +1148,7 @@ return [
                 'format' => '',
                 'size' => 32,
                 'signed' => true,
-                'required' => true,
+                'required' => false,
                 'default' => null,
                 'array' => false,
                 'filters' => [],
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 889571fe62..dbc07f950b 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -149,7 +149,31 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         $dbForProject = $getProjectDB($project);
 
         /** @var Document $deployment */
-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
+        if (!empty($rule->getAttribute('deploymentId', ''))) {
+            $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
+        } else {
+            // 1.6.x DB schema compatibility
+            // TODO: Make sure deploymentId is never empty, and remove this code
+
+            // Check if site or function; should never be site, but better safe than sorry
+            // Attempts to use attribute from both schemas (1.6 and 1.7)
+            $resourceType = $rule->getAttribute('deploymentResourceType', $rule->getAttribute('resourceType', ''));
+
+            // ID of site or function
+            $resourceId = $rule->getAttribute('deploymentResourceId', '');
+
+            // Document of site or function
+            $resource = $resourceType === 'function' ?
+                Authorization::skip(fn () => $dbForProject->getDocument('functions', $resourceId)) :
+                Authorization::skip(fn () => $dbForProject->getDocument('sites', $resourceId));
+
+            // ID of active deployments
+            // Attempts to use attribute from both schemas (1.6 and 1.7)
+            $activeDeploymentId = $resource->getAttribute('deploymentId', $resource->getAttribute('deployment', ''));
+
+            // Get deployment document, as intended originally
+            $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $activeDeploymentId));
+        }
 
         if ($deployment->getAttribute('resourceType', '') === 'functions') {
             $type = 'function';