diff --git a/datahandling/serial_datahandling.py b/datahandling/serial_datahandling.py
index 7aa5d2de673a175ad45d60d94e106f521f80b6fa..5ede29e2aad07162779f5d3e8003feb5888790a4 100644
--- a/datahandling/serial_datahandling.py
+++ b/datahandling/serial_datahandling.py
@@ -197,7 +197,9 @@ class SerialDataHandling(DataHandling):
         arr.flags.writeable = False
         return arr
 
-    def swap(self, name1, name2, gpu=False):
+    def swap(self, name1, name2, gpu=None):
+        if gpu is None:
+            gpu = self.default_target == "gpu"
         arr = self.gpu_arrays if gpu else self.cpu_arrays
         arr[name1], arr[name2] = arr[name2], arr[name1]