diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87332e7..510db8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Version 1.1.1
+### Bugfix
+* Fixed crashing with Salmon Run Schedule when there's a mystery weapon
+
 ## Version 1.1.0
 ### New Features
 * Salmon Run Schedule
diff --git a/package.json b/package.json
index dbbfeea..14e4666 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "squid-tracks",
   "description": "alternative splatnet2 client with ability to upload to stat.ink",
   "productName": "SquidTracks",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "author": "@Wrong_Shoe",
   "devDependencies": {
diff --git a/src/salmon.css b/src/salmon.css
index 304157f..4c2c9d8 100644
--- a/src/salmon.css
+++ b/src/salmon.css
@@ -51,3 +51,15 @@
   border-top: 1px red solid;
   width: 100%;
 }
+
+.mystery {
+  display: inline-block;
+  text-align: center;
+  width: 30px;
+  background: grey;
+  height: 30px;
+  vertical-align: middle;
+  color: white;
+  font-size: 1.5em;
+  border-radius: 20px;
+}
diff --git a/src/salmon.js b/src/salmon.js
index 3072195..30aa3a3 100644
--- a/src/salmon.js
+++ b/src/salmon.js
@@ -245,14 +245,19 @@ const SalmonDetail = ({ detail }) => {
           alt={detail.stage.name}
         />
         <br />
-        {detail.weapons.map((weapon, i) => (
-          <Image
-            key={i}
-            src={`https://app.splatoon2.nintendo.net${weapon.thumbnail}`}
-            style={{ maxHeight: 40 }}
-            alt={weapon.name}
-          />
-        ))}
+        {detail.weapons.map(
+          (weapon, i) =>
+            weapon == null ? (
+              <div className="mystery">?</div>
+            ) : (
+              <Image
+                key={i}
+                src={`https://app.splatoon2.nintendo.net${weapon.thumbnail}`}
+                style={{ maxHeight: 40 }}
+                alt={weapon.name}
+              />
+            )
+        )}
       </Panel.Body>
     </Panel>
   );