diff --git a/cmd/skaffold/app/cmd/dev.go b/cmd/skaffold/app/cmd/dev.go
index 0711939974f..d4a53a4fd2f 100644
--- a/cmd/skaffold/app/cmd/dev.go
+++ b/cmd/skaffold/app/cmd/dev.go
@@ -83,14 +83,11 @@ func doDev(ctx context.Context, out io.Writer) error {
 					}
 				}
 			}
-			if err != nil {
-				if errors.Cause(err) == runner.ErrorConfigurationChanged {
-					return err
-				}
+
+			if err != nil && errors.Cause(err) != runner.ErrorConfigurationChanged {
 				r.RPCServerShutdown()
 				return alwaysSucceedWhenCancelled(ctx, err)
 			}
-			r.RPCServerShutdown()
 		}
 	}
 }