diff --git a/src/api/marneApi.tsx b/src/api/marneApi.tsx
index 9f1bae5..82e2884 100644
--- a/src/api/marneApi.tsx
+++ b/src/api/marneApi.tsx
@@ -24,6 +24,8 @@ export interface ModListReturn {
 export interface RotationReturn {
   map: string;
   mode: string;
+  mapLongName?: string;
+  modeLongName?: string;
 }
 
 export interface ServerInfoReturn {
@@ -348,18 +350,22 @@ export class ApiProvider extends JsonClient {
       description: result?.description,
       rotation: result?.rotation?.map(
         (current: RotationReturn, index: number) => {
-          const internalMapName: string =
-            current?.map?.split("/").slice(-1)[0] || "";
-          return {
-            index,
-            mapname:
-              maps[internalMapName] ||
-              capitalizeFirstLetter(current?.map || ""),
-            mode:
-              modes[current?.mode] ||
-              capitalizeFirstLetter(current?.mode || ""),
-            image: map_image[internalMapName] || "",
-          };
+          if (current !== null) {
+            const internalMapName: string =
+              current?.mapLongName?.split("/").slice(-1)[0] ||
+              current?.map?.split("/").slice(-1)[0] ||
+              "";
+            return {
+              index,
+              mapname:
+                maps[internalMapName] ||
+                capitalizeFirstLetter(current?.map || ""),
+              mode:
+                modes[current?.mode] ||
+                capitalizeFirstLetter(current?.mode || ""),
+              image: map_image[internalMapName] || "",
+            };
+          }
         },
       ),
       players:
diff --git a/src/components/routes/Servers/Detailed/Main.tsx b/src/components/routes/Servers/Detailed/Main.tsx
index cab9558..4f1aafd 100644
--- a/src/components/routes/Servers/Detailed/Main.tsx
+++ b/src/components/routes/Servers/Detailed/Main.tsx
@@ -361,13 +361,14 @@ export function Results(props: Views): React.ReactElement {
                       />
                     ))
                   : stats?.rotation?.map(
-                      (key: ServerRotation, index: number) => (
-                        <MapRotationItem
-                          key={index}
-                          index={index}
-                          stats={key}
-                        />
-                      ),
+                      (key: ServerRotation, index: number) =>
+                        key && (
+                          <MapRotationItem
+                            key={index}
+                            stats={key}
+                            index={index}
+                          />
+                        ),
                     )}
               </Align>
             </>