diff --git a/app/build.gradle b/app/build.gradle
index ba385e9..3a3f4b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'com.samebits.beacon.locator'
         minSdkVersion 18
         targetSdkVersion 22
-        versionCode 117
-        versionName '1.1.7'
+        versionCode 118
+        versionName '1.1.8'
         testApplicationId 'com.samebits.beacon.locator.test'
     }
     buildTypes {
diff --git a/app/src/main/java/com/samebits/beacon/locator/ui/fragment/DetectedBeaconsFragment.java b/app/src/main/java/com/samebits/beacon/locator/ui/fragment/DetectedBeaconsFragment.java
index 5afb927..45e3d5f 100644
--- a/app/src/main/java/com/samebits/beacon/locator/ui/fragment/DetectedBeaconsFragment.java
+++ b/app/src/main/java/com/samebits/beacon/locator/ui/fragment/DetectedBeaconsFragment.java
@@ -145,13 +145,13 @@ private void stopScanTimeout() {
     }
 
     private void emptyListSetup() {
-        if (mBeaconsAdapter != null && mBeaconsAdapter.getItemCount() == 0) {
-            if (mEmpty != null) {
+        if (mEmpty != null) {
+            if (mBeaconsAdapter != null && mBeaconsAdapter.getItemCount() == 0) {
                 mEmpty.setVisibility(View.VISIBLE);
+                mEmptyView.text.setText(getString(R.string.text_please_start_scan));
+            } else {
+                mEmpty.setVisibility(View.GONE);
             }
-            mEmptyView.text.setText(getString(R.string.text_please_start_scan));
-        } else {
-            mEmpty.setVisibility(View.GONE);
         }
     }