diff --git a/frontend/src/components/LeftSideBar.jsx b/frontend/src/components/LeftSideBar.jsx
index e7a97c11..5245c9bc 100644
--- a/frontend/src/components/LeftSideBar.jsx
+++ b/frontend/src/components/LeftSideBar.jsx
@@ -84,7 +84,6 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
   const tab = params.get("tab");
   const currentPath = tab ? `${window.location.pathname}?tab=${tab}` : window.location.pathname;
   const [hoverOnAvatar, setHoverOnAvatar] = useState(false);
-  const [showProductionStatus, setShowProductionStatus] = useState(false);
   const [orgOptions, setOrgOptions] = useState(
     userdata?.orgs?.map((org) => ({
       id: org.id,
@@ -129,17 +128,6 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
     }
   }, [userdata]);
 
-  useEffect(() => {
-  if (activeOrgData?.id?.length > 0 && typeof activeOrgData.created === "number") {
-    const nowUnix = Math.floor(Date.now() / 1000);
-
-    const THIRTY_DAYS = 30 * 24 * 60 * 60;
-    const isAfter30Days = nowUnix >= activeOrgData.created + THIRTY_DAYS;
-
-    setShowProductionStatus(isAfter30Days);
-  }
-}, [activeOrgData]);
-      
       
   
   const CustomPopper = (props) => {
@@ -1963,7 +1951,7 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
 		  </div>
 	  }
 
-      {!isCloud && showProductionStatus? (
+      {!isCloud && activeOrgData?.old_org? (
           <div
            style={{
                       display: "flex",
diff --git a/frontend/src/views/Workflows2.jsx b/frontend/src/views/Workflows2.jsx
index 67277177..f94b38b5 100644
--- a/frontend/src/views/Workflows2.jsx
+++ b/frontend/src/views/Workflows2.jsx
@@ -812,7 +812,7 @@ const Workflows2 = (props) => {
     const [isLoadingWorkflow, setIsLoadingWorkflow] = useState(false);
     const [isLoadingPublicWorkflow, setIsLoadingPublicWorkflow] = useState(false);
     const [view, setView] = useState(localStorage?.getItem("workflowView") || "grid");
-    const [showProductionStatus, setShowProductionStatus] = useState(false);
+    const [currentOrg, setCurrentOrg] = useState(null);
 
     const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
 	const [showExecutionStats, setShowExecutionStats] = React.useState(localStorage?.getItem("showExecutionStats") === "true") 
@@ -971,11 +971,8 @@ const Workflows2 = (props) => {
         .then((response) => (response.ok ? response.json() : null))
         .then((org) => {
           if (!fetched && org) {
-            const nowUnix = Math.floor(Date.now() / 1000);
-            const THIRTY_DAYS = 30 * 24 * 60 * 60;
-            const isAfter30Days = nowUnix >= org.created + THIRTY_DAYS;
-            setShowProductionStatus(isAfter30Days);
             if (!isCloud) {
+                setCurrentOrg(org);
                 if (org?.cloud_sync  && org?.subscriptions[0]?.name?.toLowerCase().includes("enterprise") && org?.subscriptions[0]?.active) {
                   setIsProdStatusOn(true);
                 } else if (org?.subscriptions[0]?.name?.toLowerCase().includes("enterprise") && org?.subscriptions[0]?.active) {
@@ -5523,7 +5520,7 @@ const Workflows2 = (props) => {
                         	</div>
 						}
 						
-						{!isCloud && showProductionStatus ? (
+						{!isCloud && currentOrg?.old_org ? (
 						  <div
 						   	style={{
 							  display: "flex",