diff --git a/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java b/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java
index ab873734..1d98ce15 100644
--- a/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java
+++ b/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java
@@ -57,6 +57,7 @@ public class RtspConnection {
 		try {
 			s.setTcpNoDelay(true);
 			s.connect(new InetSocketAddress(context.serverAddress, PORT), RTSP_TIMEOUT);
+			s.setSoTimeout(RTSP_TIMEOUT);
 			
 			RtspStream rtspStream = new RtspStream(s.getInputStream(), s.getOutputStream());
 			try {