diff --git a/squad-server/index.js b/squad-server/index.js
index b1cdfca..e085e68 100644
--- a/squad-server/index.js
+++ b/squad-server/index.js
@@ -432,6 +432,8 @@ export default class SquadServer extends EventEmitter {
 
       const currentLayer = await Layers.getLayerByName(currentMap.layer);
       console.log(currentLayer);
+      if(!currentLayer) currentLayer = await Layers.getLayerByClassname(currentMap.layer);
+      console.log(currentLayer);
       const nextLayer = nextMapToBeVoted ? null : await Layers.getLayerByName(nextMap.layer);
 
       if (this.layerHistory.length === 0) {