diff --git a/pkg/health/server/server.go b/pkg/health/server/server.go
index <HASH>..<HASH> 100644
--- a/pkg/health/server/server.go
+++ b/pkg/health/server/server.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Authors of Cilium
+// Copyright 2017-2018 Authors of Cilium
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -224,11 +224,9 @@ func (s *Server) runActiveServices() error {
 		}
 	}
 	prober.RunLoop()
+	defer prober.Stop()
 
-	err := s.Server.Serve()
-	prober.Stop()
-
-	return err
+	return s.Server.Serve()
 }
 
 // Serve spins up the following goroutines:
health: Tidy up termination of active probe

This should have no functional change, but uses more standard Go style
of deferring cleanup.