diff --git a/include/ntcore_cpp.h b/include/ntcore_cpp.h
index e913f45250..3cbe2ed3a6 100644
--- a/include/ntcore_cpp.h
+++ b/include/ntcore_cpp.h
@@ -184,7 +184,7 @@ typedef std::function<void(unsigned int uid, StringRef name,
                            std::shared_ptr<Value> value, bool is_new)>
     EntryListenerCallback;
 
-typedef std::function<void(unsigned int uid, int connected,
+typedef std::function<void(unsigned int uid, bool connected,
                            const ConnectionInfo& conn)>
     ConnectionListenerCallback;
 
diff --git a/src/NetworkConnection.cpp b/src/NetworkConnection.cpp
index 67e9487889..4d5eefcffd 100644
--- a/src/NetworkConnection.cpp
+++ b/src/NetworkConnection.cpp
@@ -99,7 +99,7 @@ void NetworkConnection::ReadThreadMain() {
   }
 
   m_state = static_cast<int>(kActive);
-  m_notifier.NotifyConnection(1, info());
+  m_notifier.NotifyConnection(true, info());
   while (m_active) {
     if (!m_stream)
       break;
@@ -118,7 +118,7 @@ void NetworkConnection::ReadThreadMain() {
     m_process_incoming(std::move(msg), this);
   }
   DEBUG3("read thread died");
-  if (m_state != kDead) m_notifier.NotifyConnection(0, info());
+  if (m_state != kDead) m_notifier.NotifyConnection(false, info());
   m_state = static_cast<int>(kDead);
   m_active = false;
   m_outgoing.push(Outgoing());  // also kill write thread
@@ -149,7 +149,7 @@ void NetworkConnection::WriteThreadMain() {
     DEBUG4("sent " << encoder.size() << " bytes");
   }
   DEBUG3("write thread died");
-  if (m_state != kDead) m_notifier.NotifyConnection(0, info());
+  if (m_state != kDead) m_notifier.NotifyConnection(false, info());
   m_state = static_cast<int>(kDead);
   m_active = false;
   if (m_stream) m_stream->close();  // also kill read thread
diff --git a/src/Notifier.cpp b/src/Notifier.cpp
index c4c65db3bb..8e277746fd 100644
--- a/src/Notifier.cpp
+++ b/src/Notifier.cpp
@@ -116,7 +116,7 @@ void Notifier::RemoveConnectionListener(unsigned int conn_listener_uid) {
     m_conn_listeners[conn_listener_uid] = nullptr;
 }
 
-void Notifier::NotifyConnection(int connected,
+void Notifier::NotifyConnection(bool connected,
                                 const ConnectionInfo& conn_info) {
   if (!m_active) return;
   std::unique_lock<std::mutex> lock(m_mutex);
diff --git a/src/Notifier.h b/src/Notifier.h
index dfbc0bda95..1121a3256c 100644
--- a/src/Notifier.h
+++ b/src/Notifier.h
@@ -44,7 +44,7 @@ class Notifier {
   unsigned int AddConnectionListener(ConnectionListenerCallback callback);
   void RemoveConnectionListener(unsigned int conn_listener_uid);
 
-  void NotifyConnection(int connected, const ConnectionInfo& conn_info);
+  void NotifyConnection(bool connected, const ConnectionInfo& conn_info);
 
  private:
   Notifier();
@@ -70,10 +70,10 @@ class Notifier {
   std::queue<EntryNotification> m_entry_notifications;
 
   struct ConnectionNotification {
-    ConnectionNotification(int connected_, const ConnectionInfo& conn_info_)
+    ConnectionNotification(bool connected_, const ConnectionInfo& conn_info_)
         : connected(connected_), conn_info(conn_info_) {}
 
-    int connected;
+    bool connected;
     ConnectionInfo conn_info;
   };
   std::queue<ConnectionNotification> m_conn_notifications;
diff --git a/src/ntcore_c.cpp b/src/ntcore_c.cpp
index 9391090f6b..c5d8453aaf 100644
--- a/src/ntcore_c.cpp
+++ b/src/ntcore_c.cpp
@@ -182,10 +182,10 @@ void NT_RemoveEntryListener(unsigned int entry_listener_uid) {
 unsigned int NT_AddConnectionListener(void *data,
                                       NT_ConnectionListenerCallback callback) {
   return nt::AddConnectionListener(
-      [=](unsigned int uid, int connected, const ConnectionInfo &conn) {
+      [=](unsigned int uid, bool connected, const ConnectionInfo &conn) {
         NT_ConnectionInfo conn_c;
         ConvertToC(conn, &conn_c);
-        callback(uid, data, connected, &conn_c);
+        callback(uid, data, connected ? 1 : 0, &conn_c);
         DisposeConnectionInfo(&conn_c);
       });
 }