diff --git a/apps/demo/.env.example b/apps/demo/.env.example
index e6c657045e..90d5b7d8c8 100644
--- a/apps/demo/.env.example
+++ b/apps/demo/.env.example
@@ -2,4 +2,4 @@ NEXT_PUBLIC_FORMBRICKS_API_HOST=http://localhost:3000
 NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID=YOUR_ENVIRONMENT_ID
 
 # Copy the environment ID for the URL of your Formbricks App and
-# paste it above to connect your Formbricks App with the Demo App.
+# paste it above to connect your Formbricks App with the Demo App.
\ No newline at end of file
diff --git a/apps/web/app/(app)/environments/[environmentId]/components/UrlShortenerModal.tsx b/apps/web/app/(app)/environments/[environmentId]/components/UrlShortenerModal.tsx
index dd4a827405..646b5441ec 100644
--- a/apps/web/app/(app)/environments/[environmentId]/components/UrlShortenerModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/components/UrlShortenerModal.tsx
@@ -116,6 +116,7 @@ export default function UrlShortenerModal({ open, setOpen, surveyBaseUrl }: UrlS
                 onBlur={handleUrlValidation}
               />
               <Button
+                disabled={watch("url") === "" ? true : false}
                 variant="darkCTA"
                 size="sm"
                 className="col-span-1 text-center"
@@ -139,6 +140,7 @@ export default function UrlShortenerModal({ open, setOpen, surveyBaseUrl }: UrlS
               {shortUrl}
             </span>
             <Button
+              disabled={shortUrl === "" ? true : false}
               variant="secondary"
               size="sm"
               className="col-span-1 justify-center"