diff --git a/src/ShipSnapshotProvider/ShipSnapshotProvider.tsx b/src/ShipSnapshotProvider/ShipSnapshotProvider.tsx
index c9284e3..228d9cb 100644
--- a/src/ShipSnapshotProvider/ShipSnapshotProvider.tsx
+++ b/src/ShipSnapshotProvider/ShipSnapshotProvider.tsx
@@ -423,7 +423,7 @@ export const ShipSnapshotProvider = (props: ShipSnapshotProps) => {
   );
 
   React.useEffect(() => {
-    if (!dogmaEngine.loaded) return;
+    if (!dogmaEngine.loaded || !eveData.loaded) return;
     if (currentFit === undefined || props.skills === undefined) return;
 
     const fit = fixupCharge(currentFit);