diff --git a/components/app.js b/components/app.js
index f5ae2a3..43958fe 100644
--- a/components/app.js
+++ b/components/app.js
@@ -372,6 +372,7 @@ export default class App extends Component {
 			break;
 		case "CAP":
 		case "AUTHENTICATE":
+		case "PING":
 			// Ignore these
 			break;
 		default:
diff --git a/lib/client.js b/lib/client.js
index b705682..825756c 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -106,6 +106,9 @@ export default class Client extends EventTarget {
 			console.error("SASL error:", msg);
 			this.close();
 			break;
+		case "PING":
+			this.send({ command: "PONG", params: [msg.params[0]] });
+			break;
 		case "NICK":
 			var newNick = msg.params[0];
 			if (msg.prefix.name == this.nick) {