diff --git a/HamlibTransceiver.cpp b/HamlibTransceiver.cpp
index b584d23c4..17a58ab39 100644
--- a/HamlibTransceiver.cpp
+++ b/HamlibTransceiver.cpp
@@ -177,6 +177,7 @@ HamlibTransceiver::HamlibTransceiver (TransceiverFactory::PTTMethod ptt_type, QS
   , reversed_ {false}
   , mode_query_works_ {true}
   , split_query_works_ {true}
+  , tickle_hamlib_ {false}
   , get_vfo_works_ {true}
 {
   if (!rig_)
@@ -223,8 +224,8 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
   , back_ptt_port_ {TransceiverFactory::TX_audio_source_rear == params.audio_source}
   , is_dummy_ {RIG_MODEL_DUMMY == model_number}
   , reversed_ {false}
-  , mode_query_works_ {true}
-  , split_query_works_ {true}
+  , mode_query_works_ {rig_ && rig_->caps->get_mode}
+  , split_query_works_ {rig_ && rig_->caps->get_split_vfo}
   , tickle_hamlib_ {false}
   , get_vfo_works_ {true}
 {