diff --git a/src/plugins/uniswap/uniswap.go b/src/plugins/uniswap/uniswap.go
index 3a5d733b..afbbed41 100644
--- a/src/plugins/uniswap/uniswap.go
+++ b/src/plugins/uniswap/uniswap.go
@@ -385,38 +385,38 @@ func Start() {
 
 				if isSocketClosed {
 					return
+				} else {
+					continue
 				}
 			}
 
-			if err != nil {
-				switch payload[0] {
-				// TODO: Make a table of call codes
-				case 2:
-					fmt.Printf("Unchained feedback: %s\n", payload[1:])
-
-				case 4:
-					// TODO: Refactor into a function
-					// TODO: Check for errors!
-					var challenge kosk.Challenge
-					msgpack.Unmarshal(payload[1:], &challenge)
+			switch payload[0] {
+			// TODO: Make a table of call codes
+			case 2:
+				fmt.Printf("Unchained feedback: %s\n", payload[1:])
 
-					signature, _ := bls.Sign(*sk, challenge.Random[:])
-					challenge.Signature = signature.Bytes()
+			case 4:
+				// TODO: Refactor into a function
+				// TODO: Check for errors!
+				var challenge kosk.Challenge
+				msgpack.Unmarshal(payload[1:], &challenge)
 
-					koskPayload, _ := msgpack.Marshal(challenge)
+				signature, _ := bls.Sign(*sk, challenge.Random[:])
+				challenge.Signature = signature.Bytes()
 
-					wsClient.WriteMessage(
-						websocket.BinaryMessage,
-						append([]byte{3}, koskPayload...),
-					)
+				koskPayload, _ := msgpack.Marshal(challenge)
 
-					if err != nil {
-						fmt.Println("write:", err)
-					}
+				wsClient.WriteMessage(
+					websocket.BinaryMessage,
+					append([]byte{3}, koskPayload...),
+				)
 
-				default:
-					fmt.Printf("Received unknown call code: %d\n", payload[0])
+				if err != nil {
+					fmt.Println("write:", err)
 				}
+
+			default:
+				fmt.Printf("Received unknown call code: %d\n", payload[0])
 			}
 
 		}