diff --git a/src/http_handler.e b/src/http_handler.e
index 80369127..9a2408dc 100644
--- a/src/http_handler.e
+++ b/src/http_handler.e
@@ -60,6 +60,7 @@ feature -- Inherited Features
 							end
 						end
 					end
+					is_stop_requested := main_server.stop_requested
 				end
 				l_http_socket.cleanup
 				check
diff --git a/src/http_server.e b/src/http_server.e
index f171417c..d644fafa 100644
--- a/src/http_server.e
+++ b/src/http_server.e
@@ -49,17 +49,4 @@ feature	-- Access
 	stop_requested: BOOLEAN
 			-- Stops the server
 
-feature {NONE} -- implementation
-
-	run
-		-- Start the server
-		local
-			e: EXECUTION_ENVIRONMENT
-		do
-			create e
-			from until stop_requested loop
-				e.sleep (1_000_000)
-			end
-		end
-
 end