diff --git a/app/src/main/java/com/ericsson/uecontrol/core/util/CSVWriter.java b/app/src/main/java/com/ericsson/uecontrol/core/util/CSVWriter.java
index 971a5db..29ffa13 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/util/CSVWriter.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/util/CSVWriter.java
@@ -205,7 +205,7 @@ public class CSVWriter {
         if(netInfo == null || netInfo.getType() != ConnectivityManager.TYPE_WIFI)
             return null;
 
-        WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        WifiManager wm = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         WifiInfo wifiInfo = wm.getConnectionInfo();
         return wifiInfo;
     }
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/util/WifiScanner.java b/app/src/main/java/com/ericsson/uecontrol/core/util/WifiScanner.java
index e6217bb..124399f 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/util/WifiScanner.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/util/WifiScanner.java
@@ -22,7 +22,8 @@ public class WifiScanner {
     private WifiReceiver receiverWifi;
 
     public WifiScanner() {
-        mainWifi = (WifiManager) MainActivity.getContext().getSystemService(MainActivity.getContext().WIFI_SERVICE);
+        mainWifi = (WifiManager) MainActivity.getContext().getApplicationContext()
+                .getSystemService(MainActivity.getContext().WIFI_SERVICE);
         receiverWifi = new WifiReceiver();
     }