diff --git a/wpilibc/athena/src/CameraServer.cpp b/wpilibc/athena/src/CameraServer.cpp
index 84921339a6..e165dd486b 100644
--- a/wpilibc/athena/src/CameraServer.cpp
+++ b/wpilibc/athena/src/CameraServer.cpp
@@ -412,12 +412,10 @@ CameraServer::CameraServer()
           }
           case cs::VideoEvent::kSinkSourceChanged:
           case cs::VideoEvent::kSinkCreated:
-          case cs::VideoEvent::kSinkDestroyed: {
-            UpdateStreamValues();
-            break;
-          }
+          case cs::VideoEvent::kSinkDestroyed:
           case cs::VideoEvent::kNetworkInterfacesChanged: {
             m_addresses = cs::GetNetworkInterfaces();
+            UpdateStreamValues();
             break;
           }
           default:
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
index bb0be39c60..e3451e638d 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
@@ -436,12 +436,10 @@ public class CameraServer {
         }
         case kSinkSourceChanged:
         case kSinkCreated:
-        case kSinkDestroyed: {
-          updateStreamValues();
-          break;
-        }
+        case kSinkDestroyed:
         case kNetworkInterfacesChanged: {
           m_addresses = CameraServerJNI.getNetworkInterfaces();
+          updateStreamValues();
           break;
         }
         default: