diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java
index 0454dc11a200..d69af308fd42 100644
--- a/app/src/main/java/com/owncloud/android/MainApp.java
+++ b/app/src/main/java/com/owncloud/android/MainApp.java
@@ -132,7 +132,7 @@
  */
 public class MainApp extends Application implements HasAndroidInjector, NetworkChangeListener {
     public static final OwnCloudVersion OUTDATED_SERVER_VERSION = NextcloudVersion.nextcloud_30;
-    public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_20;
+    public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = NextcloudVersion.nextcloud_23;
 
     private static final String TAG = MainApp.class.getSimpleName();
     public static final String DOT = ".";
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt
index 3326e134990f..5ed2c45e47a4 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt
@@ -62,8 +62,6 @@ import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ListFragmentBinding
 import com.owncloud.android.lib.common.utils.Log_OC
-import com.owncloud.android.lib.resources.files.SearchRemoteOperation
-import com.owncloud.android.lib.resources.status.OwnCloudVersion
 import com.owncloud.android.ui.EmptyRecyclerView
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.activity.FolderPickerActivity
@@ -71,9 +69,7 @@ import com.owncloud.android.ui.activity.OnEnforceableRefreshListener
 import com.owncloud.android.ui.activity.UploadFilesActivity
 import com.owncloud.android.ui.adapter.localFileList.LocalFileListAdapter
 import com.owncloud.android.ui.adapter.filelist.OCFileListAdapter
-import com.owncloud.android.ui.events.SearchEvent
 import com.owncloud.android.utils.theme.ViewThemeUtils
-import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 import kotlin.math.max
 import kotlin.math.min
@@ -260,18 +256,7 @@ open class ExtendedListFragment :
                 } else {
                     Handler(Looper.getMainLooper()).post {
                         if (adapter is OCFileListAdapter) {
-                            if (accountManager
-                                    .user
-                                    .server
-                                    .version
-                                    .isNewerOrEqual(OwnCloudVersion.nextcloud_20)
-                            ) {
-                                activity.performUnifiedSearch(query, listOfHiddenFiles)
-                            } else {
-                                EventBus.getDefault().post(
-                                    SearchEvent(query, SearchRemoteOperation.SearchType.FILE_SEARCH)
-                                )
-                            }
+                            activity.performUnifiedSearch(query, listOfHiddenFiles)
                         } else if (adapter is LocalFileListAdapter) {
                             adapter.filter(query)
                         }
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.kt
index d56341b621bc..343811c31d9a 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.kt
@@ -59,7 +59,6 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
-import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
 import com.owncloud.android.operations.RefreshFolderOperation
 import com.owncloud.android.providers.UsersAndGroupsSearchConfig
@@ -805,10 +804,6 @@ class FileDetailSharingFragment :
     }
 
     override fun showProfileBottomSheet(user: User, shareWith: String?) {
-        if (!user.server.version.isNewerOrEqual(NextcloudVersion.nextcloud_23)) {
-            return
-        }
-
         val userId = shareWith ?: return
         val activity = fileActivity ?: return