diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index dc6c335cc887..91184eb68183 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -184,12 +184,10 @@ class AccountApiController extends BaseAPIController
 
         $devices = json_decode($account->devices, true);
 
-        foreach($devices as $key => $value)
+        for($x=0; $x<count($devices); $x++)
         {
-
-            if($request->token == $value['token'])
-                unset($devices[$key]);
-
+            if($request->token == $devices[$x]['token'])
+                unset($devices[$x]);
         }
 
         $account->devices = json_encode(array_values($devices));
diff --git a/app/Ninja/DNS/Cloudflare.php b/app/Ninja/DNS/Cloudflare.php
index 56b7bea19281..5bdabf9e5912 100644
--- a/app/Ninja/DNS/Cloudflare.php
+++ b/app/Ninja/DNS/Cloudflare.php
@@ -15,31 +15,36 @@ class Cloudflare
         foreach($zones as $zone)
         {
 
-            $curl = curl_init();
-            $jsonEncodedData = json_encode(['type'=>'A', 'name'=>$account->subdomain, 'content'=>env('CLOUDFLARE_TARGET_IP_ADDRESS',''),'proxied'=>true]);
+            if($account->subdomain != "")
+            {
 
-            $opts = [
-                CURLOPT_URL => 'https://api.cloudflare.com/client/v4/zones/'.$zone.'/dns_records',
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_CUSTOMREQUEST => 'POST',
-                CURLOPT_POST => 1,
-                CURLOPT_POSTFIELDS => $jsonEncodedData,
-                CURLOPT_HTTPHEADER => [ 'Content-Type: application/json',
-                    'Content-Length: '.strlen($jsonEncodedData),
-                    'X-Auth-Email: '.env('CLOUDFLARE_EMAIL', ''),
-                    'X-Auth-Key: '.env('CLOUDFLARE_API_KEY', '')
-                ],
-            ];
+                $curl = curl_init();
+                $jsonEncodedData = json_encode(['type' => 'A', 'name' => $account->subdomain, 'content' => env('CLOUDFLARE_TARGET_IP_ADDRESS', ''), 'proxied' => true]);
 
-            curl_setopt_array($curl, $opts);
+                $opts = [
+                    CURLOPT_URL => 'https://api.cloudflare.com/client/v4/zones/' . $zone . '/dns_records',
+                    CURLOPT_RETURNTRANSFER => true,
+                    CURLOPT_CUSTOMREQUEST => 'POST',
+                    CURLOPT_POST => 1,
+                    CURLOPT_POSTFIELDS => $jsonEncodedData,
+                    CURLOPT_HTTPHEADER => ['Content-Type: application/json',
+                        'Content-Length: ' . strlen($jsonEncodedData),
+                        'X-Auth-Email: ' . env('CLOUDFLARE_EMAIL', ''),
+                        'X-Auth-Key: ' . env('CLOUDFLARE_API_KEY', '')
+                    ],
+                ];
 
-            $result = curl_exec($curl);
-            $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+                curl_setopt_array($curl, $opts);
 
-            curl_close($curl);
+                $result = curl_exec($curl);
+                $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 
-            if ($status != 200)
-                Utils::logError('unable to update subdomain ' . $account->subdomain . ' @ Cloudflare - '.$result);
+                curl_close($curl);
+
+                if ($status != 200)
+                    Utils::logError('unable to update subdomain ' . $account->subdomain . ' @ Cloudflare - ' . $result);
+
+            }
 
         }