diff --git a/app/build.gradle b/app/build.gradle
index 555e67ed5a..8a2904c223 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2216
-        versionName "0.22.16"
+        versionCode 2217
+        versionName "0.22.17"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt
index 27816a1fb3..5571b233d9 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt
@@ -104,11 +104,12 @@ class MySubmissionFragment : Fragment(), CompoundButton.OnCheckedChangeListener
 
         val adapter = AdapterMySubmission(requireActivity(), submissions, exams)
         val itemCount = adapter.itemCount
-        showNoData(fragmentMySubmissionBinding.tvMessage, itemCount, "submission")
-
-        if (itemCount == 0) {
-            fragmentMySubmissionBinding.llSearch.visibility = View.GONE
-            fragmentMySubmissionBinding.title.visibility = View.GONE
+        if(s.isNullOrEmpty()){
+            showNoData(fragmentMySubmissionBinding.tvMessage, itemCount, "submission")
+                if (itemCount == 0) {
+                fragmentMySubmissionBinding.llSearch.visibility = View.GONE
+                fragmentMySubmissionBinding.title.visibility = View.GONE
+            }
         }
         adapter.setmRealm(mRealm)
         adapter.setType(type)