diff --git a/backend/dbLocation.sqlite b/backend/dbLocation.sqlite
index 5404dca..4c7caa2 100644
Binary files a/backend/dbLocation.sqlite and b/backend/dbLocation.sqlite differ
diff --git a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
index 74252f6..4c19927 100644
--- a/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
+++ b/frontend/src/app/satellites/[satelliteSlug]/orbitDataGraph.tsx
@@ -194,7 +194,9 @@ const OrbitDataGraph: React.FC<OrbitDataProps> = ({
         updateSize();
 
         return () => window.removeEventListener("resize", updateSize);
-    }, [handleChartScroll, months]);
+    }, []);
+
+    console.log("orbitalData", orbitalData);
 
     return (
         <>
diff --git a/frontend/src/app/satellites/[satelliteSlug]/page.tsx b/frontend/src/app/satellites/[satelliteSlug]/page.tsx
index 3346bba..8422582 100644
--- a/frontend/src/app/satellites/[satelliteSlug]/page.tsx
+++ b/frontend/src/app/satellites/[satelliteSlug]/page.tsx
@@ -58,7 +58,7 @@ export default async function SatelliteInfoPage({
 
     // Get the satellite attributes
     let satAttributes = graphqlData?.data?.satellites?.data[0]?.attributes;
-    console.log("satAttributes", satAttributes);
+
     // If the satellite is not found return a message
     if (!satAttributes?.catalogNumberNORAD) {
         return <div className="flex justify-center">Satellite not found</div>;
@@ -74,6 +74,8 @@ export default async function SatelliteInfoPage({
         imageURL = STRAPI_URL + satelliteImage;
     }
 
+    console.log("satAttributes", satAttributes);
+
     return (
         <>
             <div className="flex flex-col items-center">
@@ -112,17 +114,9 @@ export default async function SatelliteInfoPage({
                                         : null}
                                 </p>
                             </div>
-
-                            {satAttributes.missionStatus === "IN ORBIT" ? (
-                                <div>
-                                    {" "}
-                                    <SatelliteDataHome
-                                        satelliteNum={
-                                            satAttributes?.catalogNumberNORAD
-                                        }
-                                    />
-                                </div>
-                            ) : null}
+                            <div>
+                                <SatelliteDataHome satelliteNum={noradId} />
+                            </div>
                         </div>
                         {/* Image container */}
                         <div className="w-full border-t-2 border-gray-600 xl:border-t-0">
@@ -146,14 +140,16 @@ export default async function SatelliteInfoPage({
                     <div className="w-full">
                         <LaunchDateCountDown
                             launchDate={satAttributes?.launchDate}
-                            missionStatus={satAttributes?.missionStatus}
-                            orbitalData={satAttributes?.historicalOrbitalData}
+                            missionStatus={satAttributes?.missionStatus ?? ""}
+                            orbitalData={
+                                satAttributes?.historicalOrbitalData ?? []
+                            }
                         ></LaunchDateCountDown>
                     </div>
                 ) : null}
 
                 {/* Container for map */}
-                {noradId && satAttributes.missionStatus === "IN ORBIT" ? (
+                {noradId ? (
                     <div className="mt-6 w-full">
                         <Map2d satNum={noradId} />
                     </div>
@@ -167,7 +163,6 @@ export default async function SatelliteInfoPage({
 
             {/* Container for graph of historical orbital data */}
             <div className="mt-8 flex w-full flex-col items-center">
-                {/*Pass the historicalData and the launchDate as props to OrbitDataGraph*/}
                 {noradId ? (
                     satAttributes?.launchDate ? (
                         <OrbitDataGraph
@@ -177,7 +172,6 @@ export default async function SatelliteInfoPage({
                     ) : null
                 ) : null}
             </div>
-
             {/* Related projects */}
             <div className="mt-8 flex w-full flex-col items-center">
                 {relatedProjects?.length != 0 ? (
diff --git a/frontend/src/components/satelliteData/SatelliteDataHome.tsx b/frontend/src/components/satelliteData/SatelliteDataHome.tsx
index c818572..76afe71 100644
--- a/frontend/src/components/satelliteData/SatelliteDataHome.tsx
+++ b/frontend/src/components/satelliteData/SatelliteDataHome.tsx
@@ -12,7 +12,7 @@ const updateInterval = 50; // in ms
 export default function SatelliteDataHome({
     satelliteNum,
 }: {
-    satelliteNum: string | null;
+    satelliteNum: SatelliteNumber | null;
 }) {
     const { selectedSatellite, setSelectedSatellite, satNumToEntry } =
         useSatelliteStore();
@@ -24,8 +24,7 @@ export default function SatelliteDataHome({
     useEffect(() => {
         const intervalId = setInterval(() => {
             if (satelliteNum) {
-                const satelliteNumber = parseInt(satelliteNum, 10);
-                setSelectedSatellite(satelliteNumber as SatelliteNumber);
+                setSelectedSatellite(satelliteNum);
             }
             if (selectedSatellite) {
                 // Access satellite data by name