diff --git a/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java b/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java
index 28bf7c10..49bb8cbe 100755
--- a/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java
+++ b/org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java
@@ -31,7 +31,7 @@
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
 
 import java.io.File;
@@ -193,23 +193,37 @@ public void connect(MqttConnectOptions options, String invocationContext, String
         try {
             if (persistence == null) {
                 // ask Android where we can put files
-                File myDir = service.getExternalFilesDir(TAG);
-
-                if (myDir == null) {
-                    // No external storage, use internal storage instead.
+                // some magic Android OS has no externalFileDir or it will throw an exception, so use internal storage directly.
+                File myDir = null;
+                // use internal storage instead.
+                try {
                     myDir = service.getDir(TAG, Context.MODE_PRIVATE);
-
-                    if (myDir == null) {
-                        //Shouldn't happen.
-                        resultBundle.putString(MqttServiceConstants.CALLBACK_ERROR_MESSAGE, "Error! No external and internal storage available");
-                        resultBundle.putSerializable(MqttServiceConstants.CALLBACK_EXCEPTION, new MqttPersistenceException());
-                        service.callbackToActivity(clientHandle, Status.ERROR, resultBundle);
-                        return;
+                } catch (Exception e) {
+                    //skip
+                }
+                if (myDir == null) {
+                    try {
+                        myDir = service.getFilesDir();
+                        if (myDir != null) {
+                            StringBuilder stringBuilder = new StringBuilder(myDir.getAbsolutePath());
+                            stringBuilder.append(File.separator);
+                            stringBuilder.append(TAG);
+                            myDir = new File(stringBuilder.toString());
+                            myDir.mkdirs();
+                        }
+                    } catch (Exception e) {
+                        myDir = null;
                     }
                 }
 
-                // use that to setup MQTT client persistence storage
-                persistence = new MqttDefaultFilePersistence(myDir.getAbsolutePath());
+                if (myDir == null) {
+                    // compatible very few magic Android OS.
+                    persistence = new MemoryPersistence();
+                } else {
+                    // use that to setup MQTT client persistence storage
+                    persistence = new MqttDefaultFilePersistence(
+                            myDir.getAbsolutePath());
+                }
             }
 
             IMqttActionListener listener = new MqttConnectionListener(resultBundle) {
@@ -671,7 +685,7 @@ public void onSuccess(IMqttToken asyncActionToken) {
 
                     @Override
                     public void onFailure(IMqttToken asyncActionToken,
-                            Throwable exception) {
+                                          Throwable exception) {
                         // No action
                     }
                 });
@@ -762,7 +776,7 @@ public void messageArrived(String topic, MqttMessage message) throws Exception {
      * @param activityToken
      */
     private void storeSendDetails(final String topic, final MqttMessage msg, final IMqttDeliveryToken messageToken,
-            final String invocationContext, final String activityToken) {
+                                  final String invocationContext, final String activityToken) {
         savedTopics.put(messageToken, topic);
         savedSentMessages.put(messageToken, msg);
         savedActivityTokens.put(messageToken, activityToken);