diff --git a/source/ngc/fileop.cpp b/source/ngc/fileop.cpp
index 9f92cf2..97464a7 100644
--- a/source/ngc/fileop.cpp
+++ b/source/ngc/fileop.cpp
@@ -77,6 +77,11 @@ HaltDeviceThread()
 {
 	deviceHalt = true;
 
+	#ifdef HW_RVL
+	if(inNetworkInit) // don't wait for network to initialize
+		return;
+	#endif
+
 	// wait for thread to finish
 	while(!LWP_ThreadIsSuspended(devicethread))
 		usleep(100);
@@ -122,8 +127,8 @@ devicecallback (void *arg)
 			}
 		}
 
-		InitializeNetwork(SILENT);
 		UpdateCheck();
+		InitializeNetwork(SILENT);
 #else
 		if(isMounted[METHOD_SD_SLOTA])
 		{
diff --git a/source/ngc/networkop.cpp b/source/ngc/networkop.cpp
index f52592e..b7fd358 100644
--- a/source/ngc/networkop.cpp
+++ b/source/ngc/networkop.cpp
@@ -22,7 +22,7 @@
 #include "http.h"
 #include "filebrowser.h"
 
-static bool inNetworkInit = false;
+bool inNetworkInit = false;
 static bool networkInit = false;
 static bool autoNetworkInit = true;
 static bool networkShareInit = false;
diff --git a/source/ngc/networkop.h b/source/ngc/networkop.h
index a8b74e5..bee4466 100644
--- a/source/ngc/networkop.h
+++ b/source/ngc/networkop.h
@@ -18,5 +18,6 @@ bool ConnectShare (bool silent);
 void CloseShare();
 
 extern bool updateFound;
+extern bool inNetworkInit;
 
 #endif