diff --git a/components/datarooms/add-dataroom-modal.tsx b/components/datarooms/add-dataroom-modal.tsx
index 6d140b1f9..51513ed8b 100644
--- a/components/datarooms/add-dataroom-modal.tsx
+++ b/components/datarooms/add-dataroom-modal.tsx
@@ -83,7 +83,7 @@ export function AddDataroomModal({
   const [editingFolderName, setEditingFolderName] = useState<string>("");
 
   const teamInfo = useTeam();
-  const { isFree, isPro } = usePlan();
+  const { isFree, isPro, isTrial } = usePlan();
   const analytics = useAnalytics();
 
   const useTemplate = activeTab === "generate";
@@ -346,8 +346,7 @@ export function AddDataroomModal({
     }
   };
 
-  // If the team is on a free plan, show the upgrade modal
-  if (isFree || isPro) {
+  if ((isFree || isPro) && !isTrial) {
     if (children) {
       return (
         <UpgradePlanModal
diff --git a/ee/features/templates/api/datarooms/generate.ts b/ee/features/templates/api/datarooms/generate.ts
index eb6db2132..c617c142d 100644
--- a/ee/features/templates/api/datarooms/generate.ts
+++ b/ee/features/templates/api/datarooms/generate.ts
@@ -49,7 +49,6 @@ export default async function handle(
         where: {
           id: teamId,
           plan: {
-            // exclude all teams not on `business`, `datarooms`, `datarooms-plus`, `datarooms-premium`, `business+old`, `datarooms+old`, `datarooms-plus+old`, `datarooms-premium+old` plan
             in: [
               "business",
               "datarooms",
@@ -59,6 +58,7 @@ export default async function handle(
               "datarooms+old",
               "datarooms-plus+old",
               "datarooms-premium+old",
+              "free+drtrial",
               "datarooms+drtrial",
               "business+drtrial",
               "datarooms-plus+drtrial",
diff --git a/ee/limits/server.ts b/ee/limits/server.ts
index cdac43313..b60a682d1 100644
--- a/ee/limits/server.ts
+++ b/ee/limits/server.ts
@@ -114,6 +114,7 @@ export async function getLimits({
         usage: { documents: documentCount, links: linkCount, users: userCount },
         ...(isTrial && {
           users: 3,
+          datarooms: Math.max(parsedData.datarooms ?? defaultLimits?.datarooms ?? 0, 1),
         }),
       };
     } else {
@@ -138,6 +139,7 @@ export async function getLimits({
       usage: { documents: documentCount, links: linkCount, users: userCount },
       ...(isTrial && {
         users: 3,
+        datarooms: Math.max(defaultLimits?.datarooms ?? 0, 1),
       }),
     };
   }
diff --git a/pages/api/teams/[teamId]/datarooms/index.ts b/pages/api/teams/[teamId]/datarooms/index.ts
index 3b140f3e5..314182604 100644
--- a/pages/api/teams/[teamId]/datarooms/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/index.ts
@@ -229,7 +229,6 @@ export default async function handle(
         where: {
           id: teamId,
           plan: {
-            // exclude all teams not on `business`, `datarooms`, `datarooms-plus`, `datarooms-premium`, `business+old`, `datarooms+old`, `datarooms-plus+old`, `datarooms-premium+old` plan
             in: [
               "business",
               "datarooms",
@@ -239,6 +238,7 @@ export default async function handle(
               "datarooms+old",
               "datarooms-plus+old",
               "datarooms-premium+old",
+              "free+drtrial",
               "datarooms+drtrial",
               "business+drtrial",
               "datarooms-plus+drtrial",
diff --git a/pages/datarooms/[id]/settings/index.tsx b/pages/datarooms/[id]/settings/index.tsx
index dd1c00c14..abf9c4c64 100644
--- a/pages/datarooms/[id]/settings/index.tsx
+++ b/pages/datarooms/[id]/settings/index.tsx
@@ -34,7 +34,7 @@ export default function Settings() {
   const teamId = teamInfo?.currentTeam?.id;
   const [isCopied, setIsCopied] = useState(false);
 
-  const { isBusiness, isDatarooms, isDataroomsPlus } = usePlan();
+  const { isBusiness, isDatarooms, isDataroomsPlus, isTrial } = usePlan();
 
   if (!dataroom) {
     return <div>Loading...</div>;
@@ -219,7 +219,7 @@ export default function Settings() {
               </CardFooter>
             </Card>
 
-            {isBusiness || isDatarooms || isDataroomsPlus ? (
+            {isBusiness || isDatarooms || isDataroomsPlus || isTrial ? (
               <DeleteDataroom
                 dataroomId={dataroom.id}
                 dataroomName={dataroom.name}
diff --git a/pages/datarooms/index.tsx b/pages/datarooms/index.tsx
index 3c195fa3e..7c8ffa1ee 100644
--- a/pages/datarooms/index.tsx
+++ b/pages/datarooms/index.tsx
@@ -135,17 +135,29 @@ export default function DataroomsPage() {
                     })()}
                   </span>
                 </div>
-                <UpgradePlanModal
-                  clickedPlan={PlanEnum.DataRooms}
-                  trigger="datarooms"
-                >
-                  <Button
-                    className="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"
-                    title="Upgrade to Add Data Room"
+                {datarooms.length === 0 ? (
+                  <AddDataroomModal>
+                    <Button
+                      className="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"
+                      title="Create New Dataroom"
+                    >
+                      <PlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" />
+                      <span>Create New Dataroom</span>
+                    </Button>
+                  </AddDataroomModal>
+                ) : (
+                  <UpgradePlanModal
+                    clickedPlan={PlanEnum.DataRooms}
+                    trigger="datarooms"
                   >
-                    <span>Upgrade to Add Data Room</span>
-                  </Button>
-                </UpgradePlanModal>
+                    <Button
+                      className="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"
+                      title="Upgrade to Add Data Room"
+                    >
+                      <span>Upgrade to Add Data Room</span>
+                    </Button>
+                  </UpgradePlanModal>
+                )}
               </div>
             ) : isBusiness || isDatarooms || isDataroomsPlus ? (
               <AddDataroomModal>