diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index e3f500d2..d941d652 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -997,6 +997,9 @@ void ServiceConnection(AcceptedConnection *conn)
             break;
         }
 
+        if (mapHeaders["connection"] == "close")
+            fRun = false;
+        
         if(strMethod == "GET" && strURI == "/")
             strURI="/home.html";
 
@@ -1037,9 +1040,6 @@ void ServiceConnection(AcceptedConnection *conn)
             continue;
         }
 
-        if (mapHeaders["connection"] == "close")
-            fRun = false;
-        
         if(strMethod == "GET" && strURI.substr(0, 4) == "/rss" && !GetBoolArg("-public_server_mode",false))
         {
             string rssOutput;