diff --git a/src/com/github/nutomic/controldlna/gui/ServerFragment.java b/src/com/github/nutomic/controldlna/gui/ServerFragment.java
index 0ec4ff8..a9df4df 100644
--- a/src/com/github/nutomic/controldlna/gui/ServerFragment.java
+++ b/src/com/github/nutomic/controldlna/gui/ServerFragment.java
@@ -206,7 +206,8 @@ public class ServerFragment extends ListFragment implements OnBackPressedListene
     @Override
     public void onDestroy() {
     	super.onDestroy();
-        getActivity().getApplicationContext().unbindService(mUpnpServiceConnection);	
+        getActivity().getApplicationContext().unbindService(mUpnpServiceConnection);
+        getActivity().unregisterReceiver(mWifiReceiver);
     }
     
     /**