diff --git a/app/build.gradle b/app/build.gradle
index aff468754..ecd1f7dea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,14 +76,14 @@ android {
                     'src/cliqz/res',
             ]
         }
-//        huawei {
-//            java.srcDirs += [
-//                    'src/cliqz/java',
-//            ]
-//            res.srcDirs += [
-//                    'src/cliqz/res',
-//            ]
-//        }
+        huawei {
+            java.srcDirs += [
+                    'src/cliqz/java',
+            ]
+            res.srcDirs += [
+                    'src/cliqz/res',
+            ]
+        }
     }
 
     flavorDimensions "api"
@@ -103,11 +103,11 @@ android {
             dimension "api"
             versionCode 8
         }
-//        huawei {
-//            dimension "api"
-//            versionCode 5
-//            applicationIdSuffix ".huawei"
-//        }
+        huawei {
+            dimension "api"
+            versionCode 5
+            applicationIdSuffix ".huawei"
+        }
     }
 
     splits {
@@ -199,6 +199,7 @@ dependencies {
     // On-boarding
     cliqzImplementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
     amazonImplementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
+    huaweiImplementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
 
     // memory leak analysis
     debugImplementation 'com.gu.android:toolargetool:0.2.1@aar'
diff --git a/app/src/main/java/acr/browser/lightning/constant/SearchEngines.java b/app/src/main/java/acr/browser/lightning/constant/SearchEngines.java
index a0a0f77e8..71a8da0ae 100644
--- a/app/src/main/java/acr/browser/lightning/constant/SearchEngines.java
+++ b/app/src/main/java/acr/browser/lightning/constant/SearchEngines.java
@@ -27,7 +27,7 @@ public static SearchEngines safeValueOf(String value) {
         try {
             return SearchEngines.valueOf(value);
         } catch (IllegalArgumentException e) {
-            return google;
+            return cliqz;
         }
     }
     public final String engineName;
diff --git a/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
index a56674735..6f138e942 100644
--- a/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
+++ b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
@@ -283,7 +283,7 @@ public boolean getSavePasswordsEnabled() {
     }
 
     public SearchEngines getSearchChoice() {
-        return SearchEngines.safeValueOf(mPrefs.getString(Name.SEARCH, ""));
+        return SearchEngines.safeValueOf(mPrefs.getString(Name.SEARCH, "cliqz"));
     }
 
     public String getSearchUrl() {