diff --git a/client/src/components/job-lifecycle/job-lifecycle.component.jsx b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
index dc6925055..c9303177e 100644
--- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx
+++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
@@ -13,7 +13,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function JobLifecycleComponent({bodyshop, job, ...rest}) {
-    const [loading, setLoading] = useState(false);
+    const [loading, setLoading] = useState(true);
     const [lifecycleData, setLifecycleData] = useState(null);
 
 
@@ -56,20 +56,26 @@ export function JobLifecycleComponent({bodyshop, job, ...rest}) {
 
     return (
         <Card loading={loading} title='Job Lifecycle Component'>
-            <Space direction='vertical' style={{width: '100%'}}>
-                <Card type='inner' title='Table Format'>
-                    <Table loading={loading} columns={columns} dataSource={lifecycleData} />
+            {!loading ? (
+                <Space direction='vertical' style={{width: '100%'}}>
+                    <Card type='inner' title='Table Format'>
+                        <Table columns={columns} dataSource={lifecycleData} />
+                    </Card>
+                    <Card type='inner' title='Timeline Format'>
+                        <Timeline>
+                            {lifecycleData.map((item, index) => (
+                                <Timeline.Item key={index} color={item.value === 'Open' ? 'green' : item.value === 'Scheduled' ? 'yellow' : 'red'}>
+                                    {item.value} - {new Date(item.start).toLocaleString()}
+                                </Timeline.Item>
+                            ))}
+                        </Timeline>
+                    </Card>
+                </Space>
+            ) : (
+                <Card type='inner' title='Loading'>
+                    Loading Job Timelines....
                 </Card>
-                <Card type='inner' title='Timeline Format'>
-                    <Timeline loading={loading}>
-                        {lifecycleData.map((item, index) => (
-                            <Timeline.Item key={index} color={item.value === 'Open' ? 'green' : item.value === 'Scheduled' ? 'yellow' : 'red'}>
-                                {item.value} - {new Date(item.start).toLocaleString()}
-                            </Timeline.Item>
-                        ))}
-                    </Timeline>
-                </Card>
-            </Space>
+            )}
         </Card>
     );
 }
diff --git a/server/middleware/eventAuthorizationMIddleware.js b/server/middleware/eventAuthorizationMIddleware.js
index 423fbc73f..9dd4dfd3a 100644
--- a/server/middleware/eventAuthorizationMIddleware.js
+++ b/server/middleware/eventAuthorizationMIddleware.js
@@ -1,10 +1,4 @@
 const path = require("path");
-require("dotenv").config({
-    path: path.resolve(
-        process.cwd(),
-        `.env.${process.env.NODE_ENV || "development"}`
-    ),
-});
 
 /**
  * Checks if the event secret is correct