diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDeviceCallbackAdapter.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDeviceCallbackAdapter.java
index f3e073943..8aa0007d3 100644
--- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDeviceCallbackAdapter.java
+++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDeviceCallbackAdapter.java
@@ -126,7 +126,11 @@ public void hasStopStreaming() {
 		// Send a notification msg to the UI through a callback (use a msg identifier notification message)
 		CallbackObject callBackObject = new CallbackObject(ShimmerBluetooth.NOTIFICATION_SHIMMER_STOP_STREAMING, getMacId(), getComPort());
 		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_NOTIFICATION_MESSAGE, callBackObject);
-		mShimmerDevice.setBluetoothRadioState(BT_STATE.CONNECTED);
+		if (mShimmerDevice.isSDLogging()) {
+			mShimmerDevice.setBluetoothRadioState(BT_STATE.SDLOGGING);
+		} else {
+			mShimmerDevice.setBluetoothRadioState(BT_STATE.CONNECTED);
+		}
 	}
 	
 	public void startStreaming() {