diff --git a/ClientLib/src/main/java/org/droidplanner/services/android/impl/utils/connection/WifiConnectionHandler.java b/ClientLib/src/main/java/org/droidplanner/services/android/impl/utils/connection/WifiConnectionHandler.java
index 12f2bdcb36..fcf518eef7 100644
--- a/ClientLib/src/main/java/org/droidplanner/services/android/impl/utils/connection/WifiConnectionHandler.java
+++ b/ClientLib/src/main/java/org/droidplanner/services/android/impl/utils/connection/WifiConnectionHandler.java
@@ -99,7 +99,8 @@ public void onReceive(Context context, Intent intent) {
 
                     switch (networkState) {
                         case CONNECTED:
-                            final WifiInfo wifiInfo = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO);
+                            final WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+                            final WifiInfo wifiInfo = wifiManager.getConnectionInfo(); 
                             final String wifiSSID = wifiInfo.getSSID();
                             Timber.i("Connected to " + wifiSSID);