diff --git a/src/main/java/nl/nn/testtool/web/AngularServlet.java b/src/main/java/nl/nn/testtool/web/AngularServlet.java
index e9e5008f..0b4ea822 100644
--- a/src/main/java/nl/nn/testtool/web/AngularServlet.java
+++ b/src/main/java/nl/nn/testtool/web/AngularServlet.java
@@ -146,10 +146,16 @@ public String getRequestURI() {
 			RequestDispatcher requestDispatcher = request.getRequestDispatcher(webJarsRequestURI);
 			requestDispatcher.include(requestWrapper, response);
 		} catch(FileNotFoundException e) {
-			// Serve index.html when a resource is not found
-			includeWebJarAsset(request, response, true);
+			if (forceIndexHtml) {
+				// Prevent recursion when index.html is not found
+				throw e;
+			} else {
+				// Serve index.html when a resource is not found
+				includeWebJarAsset(request, response, true);
+			}
 		}
 	}
+
 }
 
 class BaseRewritingServletOutputStream extends ServletOutputStream {