diff --git a/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java
index 4fef493c..3d23a349 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/PodcastRepository.java
@@ -10,6 +10,7 @@ import com.cappielloantonio.play.subsonic.base.ApiResponse;
 import com.cappielloantonio.play.subsonic.models.PodcastChannel;
 import com.cappielloantonio.play.subsonic.models.PodcastEpisode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import retrofit2.Call;
@@ -20,7 +21,7 @@ public class PodcastRepository {
     private static final String TAG = "PodcastRepository";
 
     public MutableLiveData<List<PodcastChannel>> getPodcastChannels(boolean includeEpisodes, String channelId) {
-        MutableLiveData<List<PodcastChannel>> livePodcastChannel = new MutableLiveData<>();
+        MutableLiveData<List<PodcastChannel>> livePodcastChannel = new MutableLiveData<>(new ArrayList<>());
 
         App.getSubsonicClientInstance(false)
                 .getPodcastClient()
@@ -43,7 +44,7 @@ public class PodcastRepository {
     }
 
     public MutableLiveData<List<PodcastEpisode>> getNewestPodcastEpisodes(int count) {
-        MutableLiveData<List<PodcastEpisode>> liveNewestPodcastEpisodes = new MutableLiveData<>();
+        MutableLiveData<List<PodcastEpisode>> liveNewestPodcastEpisodes = new MutableLiveData<>(new ArrayList<>());
 
         App.getSubsonicClientInstance(false)
                 .getPodcastClient()
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/RadioRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/RadioRepository.java
index 872cb5c7..8cedbc04 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/RadioRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/RadioRepository.java
@@ -7,6 +7,7 @@ import com.cappielloantonio.play.App;
 import com.cappielloantonio.play.subsonic.base.ApiResponse;
 import com.cappielloantonio.play.subsonic.models.InternetRadioStation;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import retrofit2.Call;
@@ -15,7 +16,7 @@ import retrofit2.Response;
 
 public class RadioRepository {
     public MutableLiveData<List<InternetRadioStation>> getInternetRadioStations() {
-        MutableLiveData<List<InternetRadioStation>> radioStation = new MutableLiveData<>();
+        MutableLiveData<List<InternetRadioStation>> radioStation = new MutableLiveData<>(new ArrayList<>());
 
         App.getSubsonicClientInstance(false)
                 .getInternetRadioClient()
@@ -23,7 +24,7 @@ public class RadioRepository {
                 .enqueue(new Callback<ApiResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getInternetRadioStations() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getInternetRadioStations() != null && response.body().getSubsonicResponse().getInternetRadioStations().getInternetRadioStations() != null) {
                             radioStation.setValue(response.body().getSubsonicResponse().getInternetRadioStations().getInternetRadioStations());
                         }
                     }