diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index ad667fed4b..55a91b5dcc 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -247,7 +247,8 @@ void OverviewPage::setBalance(
     ui->labelUnconfirmedPrivate->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedPrivateBalance, false, BitcoinUnits::separatorAlways));
     ui->labelAnonymizable->setText(BitcoinUnits::formatWithUnit(unit, anonymizableBalance, false, BitcoinUnits::separatorAlways));
 
-    ui->anonymizeButton->setEnabled(spark::IsSparkAllowed() && anonymizableBalance > 0);
+    auto wallet = walletModel->getWallet();
+    ui->anonymizeButton->setEnabled(wallet && wallet->sparkWallet && spark::IsSparkAllowed() && anonymizableBalance > 0);
 
     // only show immature (newly mined) balance if it's non-zero, so as not to complicate things
     // for the non-mining users
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index 1fe56db1cc..7ffab993fd 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -122,6 +122,13 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model)
         tableView->horizontalHeader()->setMinimumSectionSize(23);
         tableView->horizontalHeader()->setStretchLastSection(true);
 
+        auto wallet = _model->getWallet();
+        if (!wallet || !wallet->sparkWallet) {
+            ui->addressTypeCombobox->removeItem(0);
+            ui->reuseAddress->show();
+            ui->createSparkNameButton->setVisible(false);
+        }
+
         connect(tableView->selectionModel(), &QItemSelectionModel::selectionChanged,
                 this, &ReceiveCoinsDialog::recentRequestsView_selectionChanged);
     }
@@ -327,7 +334,7 @@ void ReceiveCoinsDialog::copyAmount()
 
 void ReceiveCoinsDialog::displayCheckBox(int idx)
 {
-    if(idx==0){
+    if(ui->addressTypeCombobox->currentText() == tr("Spark")){
         ui->reuseAddress->hide();
         ui->createSparkNameButton->setVisible(true);
     } else {
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index e3342db596..b18daf132a 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -422,7 +422,8 @@ void WalletView::requestedSyncWarningInfo()
 void WalletView::showAutomintSparkNotification()
 {
     auto sparkModel = walletModel->getSparkModel();
-    if (!sparkModel) {
+    auto wallet = walletModel->getWallet();
+   if (!sparkModel || !wallet || !wallet->sparkWallet) {
         return;
     }