diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui-tests/index.js
index b1fffeaf..0e0048c9 100644
--- a/resources/cider-ui-tests/index.js
+++ b/resources/cider-ui-tests/index.js
@@ -82,7 +82,7 @@ const app = new Vue({
                 meta: {total: 0, progress: 0},
                 search: "",
                 displayListing: [],
-                downloadState: 0 // 0 = not started, 1 = in progress, 2 = complete
+                downloadState: 0 // 0 = not started, 1 = in progress, 2 = complete, 3 = empty library
             },
             albums: {
                 listing: [],
@@ -323,6 +323,10 @@ const app = new Vue({
                 library = library.concat(downloaded.data)
                 self.library.songs.meta.total = downloaded.meta.total
                 self.library.songs.meta.progress = library.length
+                if(downloaded.meta.total == 0) {
+                    self.library.songs.downloadState = 3
+                    return
+                }
                 if(typeof downloaded.next == "undefined") {
                     console.log("downloaded.next is undefined")
                     self.library.songs.listing = library
diff --git a/resources/cider-ui-tests/views/main.ejs b/resources/cider-ui-tests/views/main.ejs
index 123df13f..33c68a8e 100644
--- a/resources/cider-ui-tests/views/main.ejs
+++ b/resources/cider-ui-tests/views/main.ejs
@@ -284,22 +284,7 @@
                 </transition>
                 <!-- Library - Songs -->
                 <transition name="wpfade" v-on:enter="getLibrarySongsFull()">
-                    <template v-if="page == 'library-songs'">
-                        <div class="content-inner">
-                            <h1 class="header-text">Songs</h1>
-                            <div class="search-input-container" style="width:100%;margin: 16px 0px;">
-                                <div class="search-input--icon"></div>
-                                <input type="search"
-                                       style="width:100%;"
-                                       spellcheck="false"
-                                       placeholder="Search..."
-                                       @input="searchLibrarySongs"
-                                       v-model="library.songs.search" class="search-input">
-                            </div>
-                            <mediaitem-list-item :item="item"
-                                                 v-for="item in library.songs.displayListing"></mediaitem-list-item>
-                        </div>
-                    </template>
+                    <%- include('pages/library-songs') %>
                 </transition>
                 <!-- Library - Albums -->
                 <transition name="wpfade" v-on:enter="getLibraryAlbums()">
diff --git a/resources/cider-ui-tests/views/pages/library-songs.ejs b/resources/cider-ui-tests/views/pages/library-songs.ejs
index e69de29b..fa5f5d8c 100644
--- a/resources/cider-ui-tests/views/pages/library-songs.ejs
+++ b/resources/cider-ui-tests/views/pages/library-songs.ejs
@@ -0,0 +1,17 @@
+<template v-if="page == 'library-songs'">
+    <div class="content-inner">
+        <h1 class="header-text">Songs</h1>
+        <div class="search-input-container" style="width:100%;margin: 16px 0px;">
+            <div class="search-input--icon"></div>
+            <input type="search"
+                   style="width:100%;"
+                   spellcheck="false"
+                   placeholder="Search..."
+                   @input="searchLibrarySongs"
+                   v-model="library.songs.search" class="search-input">
+        </div>
+        <div v-if="library.songs.downloadState == 3">Library contains no songs.</div>
+        <mediaitem-list-item :item="item"
+                             v-for="item in library.songs.displayListing"></mediaitem-list-item>
+    </div>
+</template>
\ No newline at end of file