diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 506dafd..24ec7ce 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -485,13 +485,11 @@
 
         final String number = c.getString(CallLogQuery.NUMBER);
         final String countryIso = c.getString(CallLogQuery.COUNTRY_ISO);
-
-        mFilteredNumberAsyncQueryHandler.isBlockedNumber(
+        final CallLogListItemViewHolder views = (CallLogListItemViewHolder) viewHolder;
+        boolean success = mFilteredNumberAsyncQueryHandler.isBlockedNumber(
                 new FilteredNumberAsyncQueryHandler.OnCheckBlockedListener() {
                     @Override
                     public void onCheckComplete(Integer id) {
-                        final CallLogListItemViewHolder views =
-                                (CallLogListItemViewHolder) viewHolder;
                         views.blockId = id;
                         if (mExtendedCallInfoService == null) {
                             loadDataAndRender(views);
@@ -507,6 +505,9 @@
                         }
                     }
                 }, number, countryIso);
+        if (!success) {
+            loadDataAndRender(views);
+        }
     }
 
     private void loadDataAndRender(CallLogListItemViewHolder views) {
diff --git a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java
index e3f8c59..52ef49a 100644
--- a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java
+++ b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java
@@ -151,7 +151,6 @@
             final OnCheckBlockedListener listener, String number, String countryIso) {
         final String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
         if (TextUtils.isEmpty(e164Number)) {
-            listener.onCheckComplete(null);
             return false;
         }
 
