diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index c54374059..6cc914cd6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -456,6 +456,10 @@ public class QueueFragment extends Fragment implements MaterialToolbar.OnMenuIte
         registerForContextMenu(recyclerView);
         recyclerView.addOnScrollListener(new LiftOnScrollListener(root.findViewById(R.id.appbar)));
 
+        swipeActions = new QueueSwipeActions();
+        swipeActions.setFilter(new FeedItemFilter(FeedItemFilter.QUEUED));
+        swipeActions.attachTo(recyclerView);
+
         recyclerAdapter = new QueueRecyclerAdapter((MainActivity) getActivity(), swipeActions) {
             @Override
             public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
@@ -475,10 +479,6 @@ public class QueueFragment extends Fragment implements MaterialToolbar.OnMenuIte
                     getResources().getInteger(R.integer.swipe_to_refresh_duration_in_ms));
         });
 
-        swipeActions = new QueueSwipeActions();
-        swipeActions.setFilter(new FeedItemFilter(FeedItemFilter.QUEUED));
-        swipeActions.attachTo(recyclerView);
-
         emptyView = new EmptyViewHandler(getContext());
         emptyView.attachToRecyclerView(recyclerView);
         emptyView.setIcon(R.drawable.ic_playlist_play);
@@ -608,7 +608,7 @@ public class QueueFragment extends Fragment implements MaterialToolbar.OnMenuIte
             int from = viewHolder.getBindingAdapterPosition();
             int to = target.getBindingAdapterPosition();
             Log.d(TAG, "move(" + from + ", " + to + ") in memory");
-            if (from >= queue.size() || to >= queue.size() || from < 0 || to < 0) {
+            if (queue == null || from >= queue.size() || to >= queue.size() || from < 0 || to < 0) {
                 return false;
             }
             queue.add(to, queue.remove(from));