diff --git a/src/com/nwu2/httpd/responses/FileResponse.java b/src/com/nwu2/httpd/responses/FileResponse.java
index a04dff34c..d897bc3f8 100644
--- a/src/com/nwu2/httpd/responses/FileResponse.java
+++ b/src/com/nwu2/httpd/responses/FileResponse.java
@@ -236,7 +236,7 @@ else if (len < 1024 * 1024)
 						}
 					}
 				}
-				if (startFrom < 0 || startFrom >= f.length()) {
+				if (range != null && (startFrom < 0 || startFrom >= f.length())) {
 					return new com.nwu2.httpd.responses.SimpleResponse(httpd,
 							com.nwu2.httpd.NanoHTTPD.Response.Status.RANGE_NOT_SATISFIABLE, Codes.MIME_PLAINTEXT,
 							"Requested Range Not Satisfiable");