diff --git a/runtime/v2/shim/shim_windows.go b/runtime/v2/shim/shim_windows.go
index 7827b25ad..0f1616a35 100644
--- a/runtime/v2/shim/shim_windows.go
+++ b/runtime/v2/shim/shim_windows.go
@@ -37,7 +37,6 @@ import (
 // setupSignals creates a new signal handler for all signals
 func setupSignals() (chan os.Signal, error) {
 	signals := make(chan os.Signal, 32)
-	// TODO: JTERRY75: Make this based on events.
 	return signals, nil
 }
 
@@ -67,7 +66,7 @@ func serveListener(path string) (net.Listener, string, error) {
 }
 
 func handleSignals(logger *logrus.Entry, signals chan os.Signal) error {
-	// TODO: JTERRY75: Make this based on events?
+	<-signals
 	return nil
 }