1 files changed, 4 insertions, 2 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index b3fc690031a8..3b6334f9e0a0 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -81,12 +81,14 @@ public class CommunicationService extends Service implements Runnable {
                         case NETWORK:
                             mClient = new NetworkClient(
                                             mServerDesired.getAddress(), this);
-                            mTransmitter = new Transmitter(mClient);
-                            mClient.setReceiver(mReceiver);
                             break;
                         case BLUETOOTH:
+                            mClient = new BluetoothClient(
+                                            mServerDesired.getAddress(), this);
                             break;
                         }
+                        mTransmitter = new Transmitter(mClient);
+                        mClient.setReceiver(mReceiver);
                         mState = State.CONNECTED;
                     }
                 }