diff --git a/src/Makefile.am b/src/Makefile.am
index edc0ba40c..daced98c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -276,8 +276,8 @@ obj/build.h: FORCE
 libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 
 # server: zcashd
-libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -DSERVER
-libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -DSERVER
+libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
+libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_server_a_SOURCES = \
   sendalert.cpp \
   addrman.cpp \
@@ -581,9 +581,9 @@ endif
 
 # bitcoin-cli binary #
 komodo_cli_SOURCES = bitcoin-cli.cpp
-komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
-komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -DCLI
+komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -DCLI
+komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -DCLI
 
 # wallet-utility binary #
 if ENABLE_WALLET
diff --git a/src/notaries_staked.cpp b/src/notaries_staked.cpp
index d29d5dfb2..e69a43397 100644
--- a/src/notaries_staked.cpp
+++ b/src/notaries_staked.cpp
@@ -36,7 +36,11 @@ int32_t STAKED_era(int timestamp)
   return(0);
 };
 
-#ifdef SERVER
+#ifdef CLI
+int8_t updateStakedNotary() {
+    return(-1);
+}
+#else
 int8_t updateStakedNotary() {
     std::string notaryname;
     char Raddress[18]; uint8_t pubkey33[33];
@@ -46,10 +50,6 @@ int8_t updateStakedNotary() {
     NOTARY_ADDRESS.assign(Raddress);
     return(StakedNotaryID(notaryname,Raddress));
 }
-#else
-int8_t updateStakedNotary() {
-    return(-1);
-}
 #endif
 
 int8_t StakedNotaryID(std::string &notaryname, char *Raddress) {
@@ -150,24 +150,24 @@ void UpdateNotaryAddrs(uint8_t pubkeys[64][33],int8_t numNotaries) {
     if ( pubkeys[0][0] == 0 )
     {
         // null pubkeys, era 0.
-#ifdef SERVER
         pthread_mutex_lock(&staked_mutex);
         memset(NOTARYADDRS,0,sizeof(NOTARYADDRS));
         NUM_NOTARIES = 0;
         pthread_mutex_unlock(&staked_mutex);
-#endif
     }
     else
     {
         // staked era is set.
-#ifdef SERVER
         pthread_mutex_lock(&staked_mutex);
         for (int i = 0; i<numNotaries; i++) {
+#ifdef CLI
+            NUM_NOTARIES = 0;
+#else
             pubkey2addr((char *)NOTARYADDRS[i],(uint8_t *)pubkeys[i]);
             NUM_NOTARIES = numNotaries;
+#endif
         }
         pthread_mutex_unlock(&staked_mutex);
-#endif
     }
 }