diff --git a/src/schema/mutations/EditTradingSystem.js b/src/schema/mutations/EditTradingSystem.js
index 728b58423..c45dd6858 100644
--- a/src/schema/mutations/EditTradingSystem.js
+++ b/src/schema/mutations/EditTradingSystem.js
@@ -17,6 +17,10 @@ const resolve = (parent, { id: _id, tradingSystem: editedTradingSystem }) => new
       rej(err);
       return;
     }
+    if (!tradingSystem) {
+      rej(err);
+      return;
+    }
     tradingSystem.history.push({
       updatedAt: tradingSystem.updatedAt,
       data: tradingSystem.data,