diff --git a/android/gradle.properties b/android/gradle.properties
index eeed3ef5a3d04530f5624cce71b2a57976938aed..ed86f0f26922ea79f4d0c8e0e84f6d74259952bb 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.21
-app.versionCode=21
+app.versionName=0.0.22
+app.versionCode=22
diff --git a/lib/utils/random_pick_word.dart b/lib/utils/random_pick_word.dart
index 90bb1a79b823789621e1071d8e5c1a05220903ed..7ffdbf0b843206a0dd456da0129f07c8b3db5c09 100644
--- a/lib/utils/random_pick_word.dart
+++ b/lib/utils/random_pick_word.dart
@@ -28,6 +28,9 @@ class RandomPickWord {
       print('Not enough words in list.');
     }
 
+    // Remove empty words
+    wordList.removeWhere((value) => value == '');
+
     // Randomize words list
     wordList.shuffle();