diff --git a/include/wx/private/webrequest.h b/include/wx/private/webrequest.h
index c4ad8ade05..b68c9c8b79 100644
--- a/include/wx/private/webrequest.h
+++ b/include/wx/private/webrequest.h
@@ -122,8 +122,6 @@ protected:
     // for the response status.
     void SetFinalStateFromStatus();
 
-    static bool IsActiveState(wxWebRequest::State state);
-
 private:
     // Called from public Cancel() at most once per object.
     virtual void DoCancel() = 0;
diff --git a/src/common/webrequest.cpp b/src/common/webrequest.cpp
index 117f9c51be..f2701029ab 100644
--- a/src/common/webrequest.cpp
+++ b/src/common/webrequest.cpp
@@ -106,11 +106,6 @@ void wxWebRequestImpl::SetFinalStateFromStatus()
     }
 }
 
-bool wxWebRequestImpl::IsActiveState(wxWebRequest::State state)
-{
-    return (state == wxWebRequest::State_Active || state == wxWebRequest::State_Unauthorized);
-}
-
 void wxWebRequestImpl::SetData(const wxString& text, const wxString& contentType, const wxMBConv& conv)
 {
     m_dataText = text.mb_str(conv);
@@ -304,8 +299,23 @@ SplitParameters(const wxString& s, wxWebRequestHeaderMap& parameters)
 
 void wxWebRequestImpl::ProcessStateEvent(wxWebRequest::State state, const wxString& failMsg)
 {
-    if ( !IsActiveState(state) && GetResponse() )
-        GetResponse()->Finalize();
+    switch ( state )
+    {
+        case wxWebRequest::State_Idle:
+            wxFAIL_MSG("unexpected");
+            break;
+
+        case wxWebRequest::State_Active:
+        case wxWebRequest::State_Unauthorized:
+            break;
+
+        case wxWebRequest::State_Completed:
+        case wxWebRequest::State_Failed:
+        case wxWebRequest::State_Cancelled:
+            if ( GetResponse() )
+                GetResponse()->Finalize();
+            break;
+    }
 
     wxString dataFile;