diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
index 9d993501..3f8d3e0c 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
@@ -384,7 +384,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
      */
     public List<Node> getNodes() {
         if (mConfig == null)
-            return null;
+            return new ArrayList<>();
 
         try {
             return getNodes(mConfig.getJSONArray("Nodes"));