diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
index 6b25f9376..b96fda0cd 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
@@ -389,17 +389,15 @@ public class CallsListController extends BaseController implements SearchView.On
 
     @Override
     public boolean onItemClick(int position) {
-        if (callItems.size() > position) {
-            overridePushHandler(new NoOpControllerChangeHandler());
-            overridePopHandler(new NoOpControllerChangeHandler());
-            CallItem callItem = callItems.get(position);
-            Intent callIntent = new Intent(getActivity(), CallActivity.class);
-            BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
-            bundleBuilder.putString("roomToken", callItem.getModel().getToken());
-            bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
-            callIntent.putExtras(bundleBuilder.build());
-            startActivity(callIntent);
-        }
+        overridePushHandler(new NoOpControllerChangeHandler());
+        overridePopHandler(new NoOpControllerChangeHandler());
+        CallItem callItem = adapter.getItem(position);
+        Intent callIntent = new Intent(getActivity(), CallActivity.class);
+        BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
+        bundleBuilder.putString("roomToken", callItem.getModel().getToken());
+        bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
+        callIntent.putExtras(bundleBuilder.build());
+        startActivity(callIntent);
 
         return true;
     }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index 30df83690..58de41ea4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -439,43 +439,41 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
     @Override
     public boolean onItemClick(int position) {
-        if (contactItems.size() > position) {
-            UserItem userItem = contactItems.get(position);
-            RetrofitBucket retrofitBucket = ApiHelper.getRetrofitBucketForCreateRoom(userEntity.getBaseUrl(), "1",
-                    userItem.getModel().getUserId());
-            ncApi.createRoom(ApiHelper.getCredentials(userEntity.getUsername(), userEntity.getToken()),
-                    retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
-                    .subscribeOn(Schedulers.newThread())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<RoomOverall>() {
-                        @Override
-                        public void onSubscribe(Disposable d) {
+        UserItem userItem = adapter.getItem(position);
+        RetrofitBucket retrofitBucket = ApiHelper.getRetrofitBucketForCreateRoom(userEntity.getBaseUrl(), "1",
+                userItem.getModel().getUserId());
+        ncApi.createRoom(ApiHelper.getCredentials(userEntity.getUsername(), userEntity.getToken()),
+                retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
+                .subscribeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<RoomOverall>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
 
-                        }
+                    }
 
-                        @Override
-                        public void onNext(RoomOverall roomOverall) {
-                            overridePushHandler(new NoOpControllerChangeHandler());
-                            overridePopHandler(new NoOpControllerChangeHandler());
-                            Intent callIntent = new Intent(getActivity(), CallActivity.class);
-                            BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
-                            bundleBuilder.putString("roomToken", roomOverall.getOcs().getData().getToken());
-                            bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
-                            callIntent.putExtras(bundleBuilder.build());
-                            startActivity(callIntent);
-                        }
+                    @Override
+                    public void onNext(RoomOverall roomOverall) {
+                        overridePushHandler(new NoOpControllerChangeHandler());
+                        overridePopHandler(new NoOpControllerChangeHandler());
+                        Intent callIntent = new Intent(getActivity(), CallActivity.class);
+                        BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
+                        bundleBuilder.putString("roomToken", roomOverall.getOcs().getData().getToken());
+                        bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
+                        callIntent.putExtras(bundleBuilder.build());
+                        startActivity(callIntent);
+                    }
 
-                        @Override
-                        public void onError(Throwable e) {
+                    @Override
+                    public void onError(Throwable e) {
 
-                        }
+                    }
 
-                        @Override
-                        public void onComplete() {
+                    @Override
+                    public void onComplete() {
 
-                        }
-                    });
-        }
+                    }
+                });
 
         return true;
     }