diff --git a/src/clj/game/core-turns.clj b/src/clj/game/core-turns.clj
index 830f60a54e..2063610a7d 100644
--- a/src/clj/game/core-turns.clj
+++ b/src/clj/game/core-turns.clj
@@ -92,7 +92,7 @@
         (update-all-advancement-costs state side))))
 
 (defn end-turn [state side args]
-  (let [max-hand-size (get-in @state [side :max-hand-size])]
+  (let [max-hand-size (max (get-in @state [side :max-hand-size]) 0)]
     (when (<= (count (get-in @state [side :hand])) max-hand-size)
       (turn-message state side false)
       (if (= side :runner)
@@ -112,4 +112,4 @@
             (set-prop state :runner card :added-virus-counter false))))
       (swap! state assoc :end-turn true)
       (clear-turn-register! state)
-      (swap! state dissoc :turn-events))))
\ No newline at end of file
+      (swap! state dissoc :turn-events))))
diff --git a/src/cljs/netrunner/gameboard.cljs b/src/cljs/netrunner/gameboard.cljs
index b038a30139..2533b3e012 100644
--- a/src/cljs/netrunner/gameboard.cljs
+++ b/src/cljs/netrunner/gameboard.cljs
@@ -616,7 +616,7 @@
 
 (defn handle-end-turn [cursor owner]
   (let [me ((:side @game-state) @game-state)
-        max-size (:max-hand-size me)]
+        max-size (max (:max-hand-size me) 0)]
     (if (> (count (:hand me)) max-size)
       (om/set-state! owner :warning (str "Discard to " max-size " cards"))
       (do (om/set-state! owner :warning nil)